diff --git a/MasterPassword/iOS/MPMainViewController.h b/MasterPassword/iOS/MPMainViewController.h
index 1af97fbb..8dffbae9 100644
--- a/MasterPassword/iOS/MPMainViewController.h
+++ b/MasterPassword/iOS/MPMainViewController.h
@@ -42,6 +42,7 @@
 @property (weak, nonatomic) IBOutlet UILabel            *toolTipBody;
 @property (weak, nonatomic) IBOutlet UIView             *userNameContainer;
 @property (weak, nonatomic) IBOutlet UITextField        *userNameField;
+@property (weak, nonatomic) IBOutlet UIButton           *passwordSettings;
 
 @property (copy) void (^contentTipCleanup)(BOOL finished);
 @property (copy) void (^toolTipCleanup)(BOOL finished);
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 4ea2c6f1..0554bc11 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -55,6 +55,7 @@ void MPElementMigrate(MPElementEntity *entity, BOOL i);
 @synthesize toolTipBody = _toolTipBody;
 @synthesize userNameContainer = _userNameContainer;
 @synthesize userNameField = _userNameField;
+@synthesize passwordSettings = _passwordSettings;
 @synthesize contentField = _contentField;
 @synthesize contentTipCleanup = _contentTipCleanup, toolTipCleanup = _toolTipCleanup;
 
@@ -200,6 +201,7 @@ void MPElementMigrate(MPElementEntity *entity, BOOL i);
     [self setUserNameTipContainer:nil];
     [self setUserNameTipBody:nil];
     [self setUserNameContainer:nil];
+    [self setPasswordSettings:nil];
     [super viewDidUnload];
 }
 
@@ -219,6 +221,10 @@ void MPElementMigrate(MPElementEntity *entity, BOOL i);
     self.passwordIncrementer.alpha = 0;
     self.passwordEdit.alpha        = 0;
     self.passwordUpgrade.alpha     = 0;
+    self.passwordSettings.alpha    = 0;
+
+    if (self.activeElement)
+        self.passwordSettings.alpha = 0.5f;
 
     if (self.activeElement.requiresExplicitMigration)
         self.passwordUpgrade.alpha = 0.5f;
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index baf68ba2..ac256e32 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -819,6 +819,7 @@ L4m3P4sSw0rD</string>
                         <outlet property="passwordCounter" destination="Iuf-np-e9C" id="CIm-Mk-nJh"/>
                         <outlet property="passwordEdit" destination="9FS-fS-xH6" id="YeB-HF-ZPk"/>
                         <outlet property="passwordIncrementer" destination="jec-mu-nPt" id="i9B-lX-zzX"/>
+                        <outlet property="passwordSettings" destination="TZ0-1K-Vvw" id="QCC-Ne-qYv"/>
                         <outlet property="passwordUpgrade" destination="zbY-EJ-Yiu" id="KAX-Wk-DC4"/>
                         <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="CLs-YI-7NC"/>
                         <outlet property="searchTipContainer" destination="zOR-Du-qRL" id="X7h-Vh-iCE"/>
@@ -1609,6 +1610,7 @@ Pink fluffy door frame.</string>
                 <relationship kind="outlet" name="passwordCounter" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="passwordEdit" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="passwordIncrementer" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="passwordSettings" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="passwordUpgrade" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="searchDelegate" candidateClass="MPSearchDelegate"/>
                 <relationship kind="outlet" name="searchTipContainer" candidateClass="UIView"/>