diff --git a/common.inc.php b/common.inc.php
index b5676b70..e92bec4f 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -420,8 +420,8 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config")
 <?
 if(file_exists($prependdir."data/logo-100.gif"))
 	echo "<img align=\"left\" height=\"50\" src=\"".$config['SFIABDIRECTORY']."/data/logo-100.gif\">";
-echo "<h1>".i18n($config['fairname'])."</h1>";
 
+echo "<h1>".i18n($config['fairname'])."</h1>";
 echo "<div align=\"right\" style=\"font-size: 0.75em;\">";
 if(isset($_SESSION['users_type'])) {
 	$types = array('volunteer' => 'Volunteer', 'judge' => 'Judge', 
@@ -431,7 +431,11 @@ if(isset($_SESSION['users_type'])) {
 		echo i18n($types[$_SESSION['users_type']]);
 	}
 	echo " {$_SESSION['email']}: ";
+	if($_SESSION['multirole']) {
+		echo "<a href=\"{$config['SFIABDIRECTORY']}/user_multirole.php\">[".i18n('Switch Roles')."]</a> ";
+	}
 	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">[".i18n("Logout")."]</a>";
+	
 } else if(isset($_SESSION['email'])) {
 	/* Backwards compatible login settings */
 	/* Check for committee */