diff --git a/html/inc/user.inc b/html/inc/user.inc
index daad097fa4..28b86ae4db 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -397,8 +397,7 @@ function show_user_summary_public($user) {
     if ($user->donated == 1) { 
         if (file_exists("../project/donations.inc")) {
             require_once("../project/donations.inc");
-            $x .= DONATION_LINK;
-            row2(tra("Donor"), $x);
+            row2(tra("Donor"), DONATION_LINK);
         }
     }
 }
diff --git a/html/user/forum_index.php b/html/user/forum_index.php
index 3fd0f74c98..23e49505e9 100644
--- a/html/user/forum_index.php
+++ b/html/user/forum_index.php
@@ -76,7 +76,7 @@ page_head(tra("%1 Message boards", PROJECT));
 
 show_forum_header($user);
 
-if (FORUM_QA_MERGED_MODE === true){
+if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
     $categories = BoincCategory::enum("true order by orderID");
 } else {
     echo "<p>"