diff --git a/course/recent.php b/course/recent.php
index 2e7e54d8773..1010518e40c 100644
--- a/course/recent.php
+++ b/course/recent.php
@@ -20,7 +20,7 @@
 
     $strrecentactivity = get_string("recentactivity");
 
-    $loggedinas = "<p class=\"logininfo\">".user_login_string($course, $USER)."</p>";
+    $loggedinas = user_login_string($course, $USER);
 
 
     if (!empty($_GET['chooserecent'])) {
diff --git a/index.php b/index.php
index ff618eea9fa..f440feb3c7b 100644
--- a/index.php
+++ b/index.php
@@ -40,9 +40,9 @@
         } else {
             $wwwroot = str_replace('http', 'https', $CFG->wwwroot);
         }
-        $loginstring = "<font size=\"2\"><a href=\"$wwwroot/login/index.php\">".get_string('login').'</a></font>';
+        $loginstring = "<span class=\"logininfo\"><a href=\"$wwwroot/login/index.php\">".get_string('login').'</a></font>';
     } else {
-        $loginstring = '<font size="1">'. user_login_string($SITE) .'</font>';
+        $loginstring = user_login_string($SITE);
         add_to_log(SITEID, 'course', 'view', 'view.php?id='.SITEID, SITEID);
     }
 
diff --git a/lib/pagelib.php b/lib/pagelib.php
index a380447537f..c0929dcafcd 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -369,9 +369,8 @@ class page_course extends page_base {
         // (i.e., no breadcrumbs other than the default one added inside this function)
         $button = empty($morebreadcrumbs) ? update_course_icon($this->courserecord->id) : '&nbsp;';
 
-        $loggedinas = '<p class="logininfo">'. user_login_string($this->courserecord, $USER) .'</p>';
         print_header($title, $this->courserecord->fullname, $crumbtext,
-                     '', '', true, $button, $loggedinas);
+                     '', '', true, $button, user_login_string($this->courserecord, $USER));
     }
 
     // SELF-REPORTING SECTION