diff --git a/ClientServerLib/ClientServerLib/CWebservice.cs b/ClientServerLib/ClientServerLib/CWebservice.cs
index 6b54e961..5e3db8cb 100644
--- a/ClientServerLib/ClientServerLib/CWebservice.cs
+++ b/ClientServerLib/ClientServerLib/CWebservice.cs
@@ -259,8 +259,6 @@ namespace ServerLib
                 return;
             }
 
-            CServer.SendProfileData(profile);
-
             if (!string.IsNullOrEmpty(profile.Password))
             {
                 int profileId = profile.ProfileId;
@@ -271,6 +269,8 @@ namespace ServerLib
 
                 CServer.SetPassword(profileId, profile.Password);
             }
+
+            CServer.SendProfileData(profile);
         }
 
         public SProfileData GetProfile(int profileId)
diff --git a/Vocaluxe/Base/Server/CVocaluxeServer.cs b/Vocaluxe/Base/Server/CVocaluxeServer.cs
index 45340056..645075db 100644
--- a/Vocaluxe/Base/Server/CVocaluxeServer.cs
+++ b/Vocaluxe/Base/Server/CVocaluxeServer.cs
@@ -85,7 +85,7 @@ namespace Vocaluxe.Base.Server
         private static bool _SendKeyEvent(string key)
         {
             bool result = false;
-            if (key != null && key != "")
+            if (!string.IsNullOrEmpty(key))
             {
                 switch (key.ToLower())
                 {