diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
index 8c93026602..6b90f55819 100644
--- a/Classes/BITAuthenticationViewController.m
+++ b/Classes/BITAuthenticationViewController.m
@@ -124,7 +124,7 @@
                                                                      CGRectGetWidth(self.tableView.bounds),
                                                                      kFooterHeight)];
     UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
-    [button setTitle:BITHockeyLocalizedString(@"Show login page") forState:UIControlStateNormal];
+    [button setTitle:BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerWebLoginButtonTitle") forState:UIControlStateNormal];
     CGSize buttonSize = [button sizeThatFits:CGSizeMake(CGRectGetWidth(self.tableView.bounds),
                                                         kFooterHeight)];
     button.frame = CGRectMake(floorf((CGRectGetWidth(containerView.bounds) - buttonSize.width) / 2.f),
diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m
index 572a376dae..1c173d6eb8 100644
--- a/Classes/BITAuthenticator.m
+++ b/Classes/BITAuthenticator.m
@@ -321,14 +321,14 @@ static NSString* const kBITAuthenticatorDidSkipOptionalLogin = @"BITAuthenticato
                           NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
                                                                code:BITAuthenticatorAPIServerReturnedInvalidRespone
                                                            userInfo:@{
-                                                                      NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"Failed to authenticate. Please try again later.")
+                                                                      NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerNetworkError")
                                                                       }];
                           completion(NO, error);
                         } else if(401 == operation.response.statusCode) {
                           NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
                                                                code:BITAuthenticatorNotAuthorized
                                                            userInfo:@{
-                                                                      NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"Not authorized")
+                                                                      NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerNotauthorized")
                                                                       }];
                           completion(NO, error);
                         } else {
@@ -342,14 +342,14 @@ static NSString* const kBITAuthenticatorDidSkipOptionalLogin = @"BITAuthenticato
                               error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
                                                           code:BITAuthenticatorNotAuthorized
                                                       userInfo:@{
-                                                                 NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"Not authorized"),
+                                                                 NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerNotauthorized"),
                                                                  NSUnderlyingErrorKey : authParseError
                                                                  }];
                             } else {
                               error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
                                                           code:BITAuthenticatorErrorUnknown
                                                       userInfo:@{
-                                                                 NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"Failed to authenticate. Please try again later."),
+                                                                 NSLocalizedDescriptionKey : BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerNetworkError"),
                                                                  NSUnderlyingErrorKey : authParseError
                                                                  }];
                             }
diff --git a/Resources/en.lproj/HockeySDK.strings b/Resources/en.lproj/HockeySDK.strings
index 469c242a9c..1a36bd3e78 100644
--- a/Resources/en.lproj/HockeySDK.strings
+++ b/Resources/en.lproj/HockeySDK.strings
@@ -233,22 +233,30 @@
 /* Email Placeholder */
 "HockeyFeedbackUserDataEmailPlaceholder" = "example@email.com";
 
+
 /* Authenticator */
+
+
+/* View Controller Title*/
 "HockeyAuthenticatorViewControllerTitle" = "Authorize";
-"HockeyAuthenticationViewControllerWebLoginDescription" = "Allow this application to access this device's UDID to identify it.";
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Please provide email and password of your HockeyApp account.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Please provide email of your HockeyApp account.";
+
+/* BITAuthenticatorAuthTypeUDIDProvider */
+"HockeyAuthenticationViewControllerWebLoginDescription" = "Please tap the following button to identify your device on HockeyApp.";
+"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Identify Device";
+
+/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
+"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Please provide the email address and password of your HockeyApp account.";
+"HockeyAuthenticationViewControllerDataEmailDescription" = "Please provide the email address of your HockeyApp account.";
 "HockeyAuthenticationViewControllerEmailPlaceholder" = "example@email.com";
 "HockeyAuthenticationViewControllerPasswordPlaceholder" = "Required";
 "HockeyAuthenticationViewControllerEmailDescription" = "Email";
 "HockeyAuthenticationViewControllerPasswordDescription" = "Password";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Password";
 
-/* error presented to the user if authentication failed because of networking issues */
-"Failed to authenticate. Please try again later." = "Failed to authenticate. Please try again later.";
+/* Error presented to the user if authentication failed because of networking issues */
+"HockeyAuthenticationViewControllerNetworkError" = "Failed to authenticate. A internet connection is required! Please try again.";
 
 /* error presented to the user if authentication failed */
-"Not authorized" = "Not authorized";
+"HockeyAuthenticationViewControllerNotauthorized" = "Not authorized";
 
 /* BarButton item to skip auth */
-"Skip" = "Skip";
\ No newline at end of file
+"Skip" = "Skip";