diff --git a/Vocaluxe/Base/CProfiles.cs b/Vocaluxe/Base/CProfiles.cs
index d77331ca..01a05653 100644
--- a/Vocaluxe/Base/CProfiles.cs
+++ b/Vocaluxe/Base/CProfiles.cs
@@ -466,7 +466,7 @@ namespace Vocaluxe.Base
             if (!IsProfileIDValid(profileID))
                 return true; // this will prevent from saving dummy profiles to highscore db
 
-            return _Profiles[profileID].UserRole.HasFlag(EUserRole.TR_USERROLE_GUEST);
+            return !_Profiles[profileID].UserRole.HasFlag(EUserRole.TR_USERROLE_NORMAL);
         }
 
         public static bool IsActive(int profileID)
diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs
index 86a2f482..9477224e 100644
--- a/Vocaluxe/Base/CSongs.cs
+++ b/Vocaluxe/Base/CSongs.cs
@@ -217,6 +217,9 @@ namespace Vocaluxe.Base
         public static void UpdateRandomSongList()
         {
             _SongsForRandom.Clear();
+            if (NumSongsVisible == 0)
+                return;
+
             //Calc avarage sing-count
             int totalCounts = 0;
             foreach (CSong song in VisibleSongs)
diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs
index bb1df5b2..274a8307 100644
--- a/VocaluxeLib/Menu/CNameSelection.cs
+++ b/VocaluxeLib/Menu/CNameSelection.cs
@@ -509,7 +509,7 @@ namespace VocaluxeLib.Menu
                     {
                         //Don't show profile if is selected, but if selected and guest
                         if (CBase.Game.GetPlayers()[p].ProfileID == profile.ID
-                            && profile.UserRole.HasFlag(EUserRole.TR_USERROLE_GUEST))
+                            && !profile.UserRole.HasFlag(EUserRole.TR_USERROLE_NORMAL))
                             visible = false;
                     }
                 }