diff --git a/Vocaluxe/Base/CProfiles.cs b/Vocaluxe/Base/CProfiles.cs
index bba41068..5d0d072b 100644
--- a/Vocaluxe/Base/CProfiles.cs
+++ b/Vocaluxe/Base/CProfiles.cs
@@ -246,7 +246,7 @@ namespace Vocaluxe.Base
         {
             if (ProfileNr < 0 || ProfileNr >= _Profiles.Count)
                 return false;
-            return _Profiles[ProfileNr].GuestProfile == EOffOn.TR_CONFIG_ON;
+            return _Profiles[ProfileNr].Active == EOffOn.TR_CONFIG_ON;
         }
 
         public static void SetAvatar(int ProfileNr, int AvatarNr)
diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index b66a5f79..7d816f66 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -223,15 +223,7 @@ namespace Vocaluxe.Screens
 
                 for (int p = 0; p < player.Length; p++)
                 {
-                    bool guest = true;
-
-                    if (player[p].ProfileID >= 0 && player[p].ProfileID < CProfiles.NumProfiles)
-                    {
-                        if (CProfiles.Profiles[player[p].ProfileID].GuestProfile == EOffOn.TR_CONFIG_OFF)
-                            guest = false;
-                    }
-
-                    if (player[p].Points > CSettings.MinScoreForDB && player[p].SongFinished && !guest)
+                    if (player[p].Points > CSettings.MinScoreForDB && player[p].SongFinished && !CProfiles.IsGuestProfile(p))
                         _NewEntryIDs.Add(CDataBase.AddScore(player[p]));
                 }
             }