diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index cec233ac86..d6fe148b7e 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -1271,12 +1271,16 @@ function is_admin($user) {
     return false;
 }
 
+// return
+// 'yes' if logged in and can post (show New thread button)
+// 'login' if could post if logged in (show login to post msg)
+// 'no' if can't post (don't show anythin)
+//
 function user_can_create_thread($user, $forum) {
-    if (!$user) return false;
-    if ($forum->is_dev_blog && !is_admin($user)) {
-        return false;
+    if ($forum->is_dev_blog) {
+        return is_admin($user)?'yes':'no';
     }
-    return true;
+    return $user ?'yes':'login';
 }
 
 function check_post_access($user, $forum) {
diff --git a/html/user/forum_forum.php b/html/user/forum_forum.php
index 7189fae3e2..48b40c7fbc 100644
--- a/html/user/forum_forum.php
+++ b/html/user/forum_forum.php
@@ -97,15 +97,19 @@ function forum_page($forum, $user, $msg=null) {
         <td colspan=2>
     ';
 
-    if ($user) {
-        if (user_can_create_thread($user, $forum)) {
-            show_button(
-                "forum_post.php?id=$forum->id",
-                tra("New thread"),
-                tra("Add a new thread to this forum")
-            );
-        }
+    switch (user_can_create_thread($user, $forum)) {
+    case 'yes':
+        show_button(
+            "forum_post.php?id=$forum->id", tra("New thread"),
+            tra("Add a new thread to this forum")
+        );
+        break;
+    case 'login':
+        echo "To add a thread, you must <a href=login_form.php>log in</a>.";
+        break;
+    }
 
+    if ($user) {
         if (is_subscribed(-$forum->id, $subs)) {
             BoincNotify::delete_aux(sprintf(
                 'userid=%d and type=%d and opaque=%d',
diff --git a/html/user/forum_post.php b/html/user/forum_post.php
index 9a046df6a3..dbf139f09f 100644
--- a/html/user/forum_post.php
+++ b/html/user/forum_post.php
@@ -43,7 +43,7 @@
     error_page("Forums are disabled");
 }
 
-if (!user_can_create_thread($logged_in_user, $forum)) {
+if (user_can_create_thread($logged_in_user, $forum)=='no') {
     error_page(tra("Only project admins may create a thread here. However, you may reply to existing threads."));
 }
 check_post_access($logged_in_user, $forum);