diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index 952daa4c..6714ef5a 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -132,8 +132,7 @@ namespace MinecraftClient
             {
                 try
                 {
-                    string serverIP = "";
-                    string login = "";
+                    string serverAlias = "";
                     string[] Lines = File.ReadAllLines(settingsfile);
                     ParseMode pMode = ParseMode.Default;
                     foreach (string lineRAW in Lines)
@@ -174,9 +173,9 @@ namespace MinecraftClient
                                         case ParseMode.Main:
                                             switch (argName.ToLower())
                                             {
-                                                case "login": login = argValue; Login = argValue; break;
+                                                case "login": Login = argValue; break;
                                                 case "password": Password = argValue; break;
-                                                case "serverip": serverIP = argValue; SetServerIP(argValue); break;
+                                                case "serverip": if(!SetServerIP(argValue)) serverAlias = argValue; ; break;
                                                 case "singlecommand": SingleCommand = argValue; break;
                                                 case "language": Language = argValue; break;
                                                 case "consoletitle": ConsoleTitle = argValue; break;
@@ -228,7 +227,7 @@ namespace MinecraftClient
                                                         }
 
                                                         //Try user value against aliases after load
-                                                        Settings.SetAccount(login);
+                                                        Settings.SetAccount(Login);
                                                     }
                                                     break;
 
@@ -257,7 +256,7 @@ namespace MinecraftClient
                                                         ServerPort = server_port_temp;
 
                                                         //Try server value against aliases after load
-                                                        SetServerIP(serverIP);
+                                                        SetServerIP(serverAlias);
                                                     }
                                                     break;