diff --git a/common.inc.php b/common.inc.php
index 60b15c6..7b57a54 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -432,7 +432,7 @@ if(isset($_SESSION['users_type'])) {
 		echo i18n($types[$_SESSION['users_type']]);
 	}
 	echo " {$_SESSION['email']}: ";
-	if($_SESSION['multirole']) {
+	if($_SESSION['multirole'] == true) {
 		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>";
diff --git a/user_login.php b/user_login.php
index beb36ce..42c9e1e 100644
--- a/user_login.php
+++ b/user_login.php
@@ -144,7 +144,7 @@
 
 			/* Setup multirole so a multirole user can switch if they want to
 			 * without logging in/out */
-			if($u['types'] > 1) {
+			if(count($u['types']) > 1) {
 				$_SESSION['multirole'] = true;
 			} else  {
 				$_SESSION['multirole'] = false;