diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h
index 2d4ab4f47..3d0223b2c 100644
--- a/Classes/WizardViewController.h
+++ b/Classes/WizardViewController.h
@@ -21,7 +21,7 @@
 #import <XMLRPCConnectionDelegate.h>
 #import "UICompositeViewController.h"
 
-@interface WizardViewController : TPMultiLayoutViewController <UITextFieldDelegate, UICompositeViewDelegate, XMLRPCConnectionDelegate> {
+@interface WizardViewController : TPMultiLayoutViewController <UITextFieldDelegate, UICompositeViewDelegate, XMLRPCConnectionDelegate, UIGestureRecognizerDelegate> {
     @private
     UITextField *activeTextField;
     UIView *currentView;
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index c17b7e0b9..408abb40a 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -154,6 +154,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     [super viewDidLoad];
     
     [viewTapGestureRecognizer setCancelsTouchesInView:FALSE];
+    [viewTapGestureRecognizer setDelegate:self];
     [contentView addGestureRecognizer:viewTapGestureRecognizer];
     
     if([LinphoneManager runningOnIpad]) {
@@ -490,20 +491,59 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onSignInExternalClick:(id)sender {
-    [self.waitView setHidden:false];
     NSString *username = [WizardViewController findTextField:ViewElement_Username  view:contentView].text;
     NSString *password = [WizardViewController findTextField:ViewElement_Password  view:contentView].text;
     NSString *domain = [WizardViewController findTextField:ViewElement_Domain  view:contentView].text;
-    [self addProxyConfig:username password:password domain:domain server:nil];
+    
+    
+    NSMutableString *errors = [NSMutableString string];
+    if ([username length] == 0) {
+        
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a username.\n", nil)]];
+    }
+    
+    if ([domain length] == 0) {
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a domain.\n", nil)]];
+    }
+    
+    if([errors length]) {
+        UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check error(s)",nil)
+                                                            message:[errors substringWithRange:NSMakeRange(0, [errors length] - 1)]
+                                                           delegate:nil
+                                                  cancelButtonTitle:NSLocalizedString(@"Continue",nil)
+                                                  otherButtonTitles:nil,nil];
+        [errorView show];
+        [errorView release];
+    } else {
+        [self.waitView setHidden:false];
+        [self addProxyConfig:username password:password domain:domain server:nil];
+    }
 }
 
 - (IBAction)onSignInClick:(id)sender {
-    [self.waitView setHidden:false];
     NSString *username = [WizardViewController findTextField:ViewElement_Username  view:contentView].text;
     NSString *password = [WizardViewController findTextField:ViewElement_Password  view:contentView].text;
-    [self addProxyConfig:username password:password
-                  domain:[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
-                  server:[[LinphoneManager instance] lpConfigStringForKey:@"proxy" forSection:@"wizard"]];
+    
+    NSMutableString *errors = [NSMutableString string];
+    if ([username length] == 0) {
+        
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a username.\n", nil)]];
+    }
+    
+    if([errors length]) {
+        UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check error(s)",nil)
+                                                            message:[errors substringWithRange:NSMakeRange(0, [errors length] - 1)]
+                                                           delegate:nil
+                                                  cancelButtonTitle:NSLocalizedString(@"Continue",nil)
+                                                  otherButtonTitles:nil,nil];
+        [errorView show];
+        [errorView release];
+    } else {
+        [self.waitView setHidden:false];
+        [self addProxyConfig:username password:password
+                      domain:[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
+                      server:[[LinphoneManager instance] lpConfigStringForKey:@"proxy" forSection:@"wizard"]];
+    }
 }
 
 - (IBAction)onRegisterClick:(id)sender {
@@ -732,4 +772,15 @@ static UICompositeViewDescription *compositeDescription = nil;
     view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue];
 }
 
+
+#pragma mark - UIGestureRecognizerDelegate Functions
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([touch.view isKindOfClass:[UIButton class]]) { //Avoid tap gesture on Button
+        [LinphoneUtils findAndResignFirstResponder:currentView];
+        return NO;
+    }
+    return YES;
+}
+
 @end
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 19d65e527..03cca0ed3 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index e4ddf09cd..93ea9abbb 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 212d5e672..a1bb4d322 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -11997,7 +11997,7 @@
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-27T16:22:23Z</date>
+					<date>2012-09-28T08:39:17Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -12007,7 +12007,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>6b28bbe0cc4362b29f1a00eec7d9ad2d
+					<string>974d882db652398dc5678a38298fec69
 </string>
 					<key>name</key>
 					<string>Localizable.strings</string>
@@ -13589,6 +13589,62 @@ La cause était: %2$@</string>
 							<key>snapshots</key>
 							<dict/>
 						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Please enter a doamin.
+</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Please enter a domain.
+</string>
+								<key>fr</key>
+								<string>Entrez un nom de domaine.
+</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Please enter a username.
+</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Please enter a username.
+</string>
+								<key>fr</key>
+								<string>Entrez un nom d'utilisateur.
+</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 						<dict>
 							<key>change date</key>
 							<date>2001-01-01T00:00:00Z</date>
diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
index 19d65e527..03cca0ed3 100644
Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ