diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
index c7489a7c..7ed21622 100644
--- a/SUPLA.xcodeproj/project.pbxproj
+++ b/SUPLA.xcodeproj/project.pbxproj
@@ -2527,7 +2527,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 42;
 				DEFINES_MODULE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = SUPLA/Info.plist;
@@ -2554,7 +2554,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 42;
 				DEFINES_MODULE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				INFOPLIST_FILE = SUPLA/Info.plist;
diff --git a/SUPLA/SuplaClient.m b/SUPLA/SuplaClient.m
index 72afd62f..01785bbc 100644
--- a/SUPLA/SuplaClient.m
+++ b/SUPLA/SuplaClient.m
@@ -270,7 +270,7 @@ - (char*) getServerHostName {
     
     NSString *host = [SAApp getServerHostName];
     if ( [host isEqualToString:@""] == YES && [SAApp getAdvancedConfig] == NO && ![[SAApp getEmailAddress] isEqualToString:@""] ) {
-        
+                
         NSMutableURLRequest *request =
         [NSMutableURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://autodiscover.supla.org/users/%@", [SAApp getEmailAddress]]] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
         
diff --git a/SuplaApp.m b/SuplaApp.m
index 78c7d86b..2538bbc3 100644
--- a/SuplaApp.m
+++ b/SuplaApp.m
@@ -253,7 +253,7 @@ +(NSString*) getAccessIDpwd {
 }
 
 +(void) setAccessIDpwd:(NSString *)pwd {
-    
+    pwd = [pwd stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:pwd forKey:@"access_id_pwd"];
     }
@@ -277,7 +277,7 @@ +(NSString*) getServerHostName {
 }
 
 -(void) setServerHostName:(NSString *)hostname {
-    
+    hostname = [hostname stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:hostname forKey:@"server_host"];
         _current_server = hostname;
@@ -309,7 +309,7 @@ +(NSString*) getEmailAddress {
 }
 
 -(void) setEmailAddress:(NSString *)email {
-    
+    email = [email stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     @synchronized(self) {
         [[NSUserDefaults standardUserDefaults] setValue:email forKey:@"email_address"];
         _current_email = email;