diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index 1179a1c9..dd8882a5 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -83,6 +83,9 @@ DQ
                             <string>NSAllRomanInputSourcesLocaleIdentifier</string>
                         </allowedInputSourceLocales>
                     </secureTextFieldCell>
+                    <connections>
+                        <outlet property="nextKeyView" destination="241" id="axS-Y0-6Hv"/>
+                    </connections>
                 </secureTextField>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="408">
                     <rect key="frame" x="366" y="140" width="29" height="25"/>
diff --git a/MacPass/MPIntegrationSettingsController.m b/MacPass/MPIntegrationSettingsController.m
index 80e40753..c819517f 100644
--- a/MacPass/MPIntegrationSettingsController.m
+++ b/MacPass/MPIntegrationSettingsController.m
@@ -49,7 +49,7 @@
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"INTEGRATION_SETTINGS", "");
+  return NSLocalizedString(@"INTEGRATION_SETTINGS", "Label for the integration settings tab");
 }
 
 - (void)awakeFromNib {
diff --git a/MacPass/MPPluginSettingsController.m b/MacPass/MPPluginSettingsController.m
index 5283fe2b..ea91e71a 100644
--- a/MacPass/MPPluginSettingsController.m
+++ b/MacPass/MPPluginSettingsController.m
@@ -49,7 +49,7 @@
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"PLUGIN_SETTINGS", "");
+  return NSLocalizedString(@"PLUGIN_SETTINGS", "Label for plugin settings tab");
 }
 
 - (void)viewDidLoad {
diff --git a/MacPass/MPValueTransformerHelper.m b/MacPass/MPValueTransformerHelper.m
index 619d0927..4ef594a0 100644
--- a/MacPass/MPValueTransformerHelper.m
+++ b/MacPass/MPValueTransformerHelper.m
@@ -43,8 +43,9 @@ NSString *const MPTokenValueTransformerName = @"com.hicknhack.macpass.MPTokenVal
   [NSValueTransformer registerValueTransformerWithName:MPExpiryDateValueTransformerName
                                  transformedValueClass:NSString.class
                     returningTransformedValueWithBlock:^id(id value) {
+                      NSString * _Nonnull noExpirationDateString = NSLocalizedString(@"NO_EXPIRE_DATE_SET", "Expiration date format, when item does not expire");
                       if(![value isKindOfClass:NSDate.class]) {
-                        return NSLocalizedString(@"NO_EXPIRE_DATE_SET","");
+                        return noExpirationDateString;
                       }
                       static NSDateFormatter *formatter;
                       if(!formatter) {
@@ -54,10 +55,10 @@ NSString *const MPTokenValueTransformerName = @"com.hicknhack.macpass.MPTokenVal
                       }
 
                       if([value isEqualToDate:[NSDate distantFuture]]) {
-                        return NSLocalizedString(@"NO_EXPIRE_DATE_SET", "");
+                        return noExpirationDateString;
                       }
 
-                      NSString *template = NSLocalizedString(@"EXPIRES_AT_DATE_%@", "");
+                      NSString *template = NSLocalizedString(@"EXPIRES_AT_DATE_%@", "Format to returen the date an item expires. Includes %@ placehoder for date");
                       return [[NSString alloc] initWithFormat:template, [formatter stringFromDate:value]];
                     }];
 
diff --git a/MacPass/MPWorkflowSettingsController.m b/MacPass/MPWorkflowSettingsController.m
index 3934680e..f4342694 100644
--- a/MacPass/MPWorkflowSettingsController.m
+++ b/MacPass/MPWorkflowSettingsController.m
@@ -53,7 +53,7 @@
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"WORKFLOW_SETTINGS", "");
+  return NSLocalizedString(@"WORKFLOW_SETTINGS", "Label for the workflow settings tab");
 }
 
 - (void)willShowTab {