diff --git a/MacPass/Base.lproj/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib
index e9ed94ac..7440c042 100644
--- a/MacPass/Base.lproj/GeneralSettings.xib
+++ b/MacPass/Base.lproj/GeneralSettings.xib
@@ -45,19 +45,19 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSBox" id="509463058">
+					<object class="NSBox" id="996160987">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">12</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSView" id="423196453">
-								<reference key="NSNextResponder" ref="509463058"/>
+							<object class="NSView" id="589191611">
+								<reference key="NSNextResponder" ref="996160987"/>
 								<int key="NSvFlags">274</int>
 								<array class="NSMutableArray" key="NSSubviews">
 									<object class="NSButton" id="145041823">
-										<reference key="NSNextResponder" ref="423196453"/>
+										<reference key="NSNextResponder" ref="589191611"/>
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {241, 18}}</string>
-										<reference key="NSSuperview" ref="423196453"/>
+										<reference key="NSSuperview" ref="589191611"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="60918609"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -90,23 +90,23 @@
 										</object>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									</object>
-									<object class="NSButton" id="223646588">
-										<reference key="NSNextResponder" ref="423196453"/>
+									<object class="NSButton" id="366343837">
+										<reference key="NSNextResponder" ref="589191611"/>
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 32}, {228, 18}}</string>
-										<reference key="NSSuperview" ref="423196453"/>
+										<reference key="NSSuperview" ref="589191611"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="145041823"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<string key="NSHuggingPriority">{250, 252}</string>
 										<bool key="NSEnabled">YES</bool>
-										<object class="NSButtonCell" key="NSCell" id="524116018">
-											<int key="NSCellFlags">-2080374784</int>
+										<object class="NSButtonCell" key="NSCell" id="480309686">
+											<int key="NSCellFlags">-1543503872</int>
 											<int key="NSCellFlags2">268435456</int>
 											<string key="NSContents">Create new Database if activated</string>
 											<reference key="NSSupport" ref="874940307"/>
 											<string key="NSCellIdentifier">_NS:9</string>
-											<reference key="NSControlView" ref="223646588"/>
+											<reference key="NSControlView" ref="366343837"/>
 											<int key="NSButtonFlags">1211912448</int>
 											<int key="NSButtonFlags2">2</int>
 											<reference key="NSNormalImage" ref="125685135"/>
@@ -120,16 +120,16 @@
 									</object>
 								</array>
 								<string key="NSFrame">{{1, 1}, {364, 58}}</string>
-								<reference key="NSSuperview" ref="509463058"/>
+								<reference key="NSSuperview" ref="996160987"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="223646588"/>
+								<reference key="NSNextKeyView" ref="366343837"/>
 								<string key="NSReuseIdentifierKey">_NS:11</string>
 							</object>
 						</array>
 						<string key="NSFrame">{{17, 157}, {366, 74}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="423196453"/>
+						<reference key="NSNextKeyView" ref="589191611"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
@@ -141,7 +141,7 @@
 								<double key="NSSize">11</double>
 								<int key="NSfFlags">3100</int>
 							</object>
-							<object class="NSColor" key="NSBackgroundColor" id="948426370">
+							<object class="NSColor" key="NSBackgroundColor" id="116323791">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textBackgroundColor</string>
@@ -155,7 +155,7 @@
 								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
 							</object>
 						</object>
-						<reference key="NSContentView" ref="423196453"/>
+						<reference key="NSContentView" ref="589191611"/>
 						<int key="NSBorderType">1</int>
 						<int key="NSBoxType">0</int>
 						<int key="NSTitlePosition">2</int>
@@ -414,7 +414,6 @@
 										<string key="NSFrame">{{31, 12}, {122, 18}}</string>
 										<reference key="NSSuperview" ref="731672371"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="252113219">
@@ -477,7 +476,7 @@
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Security</string>
 							<reference key="NSSupport" ref="26"/>
-							<reference key="NSBackgroundColor" ref="948426370"/>
+							<reference key="NSBackgroundColor" ref="116323791"/>
 							<object class="NSColor" key="NSTextColor">
 								<int key="NSColorSpace">3</int>
 								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
@@ -493,7 +492,7 @@
 				<string key="NSFrameSize">{400, 251}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="509463058"/>
+				<reference key="NSNextKeyView" ref="996160987"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 		</array>
@@ -551,7 +550,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">createUntitledOnActivation</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="223646588"/>
+						<reference key="destination" ref="366343837"/>
 					</object>
 					<int key="connectionID">920</int>
 				</object>
@@ -602,11 +601,11 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="426295361">
+							<object class="IBNSLayoutConstraint" id="871081113">
 								<reference key="firstItem" ref="60918609"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="509463058"/>
+								<reference key="secondItem" ref="996160987"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -650,8 +649,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="557389775">
-								<reference key="firstItem" ref="509463058"/>
+							<object class="IBNSLayoutConstraint" id="198070882">
+								<reference key="firstItem" ref="996160987"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1005"/>
@@ -666,11 +665,11 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="578526535">
+							<object class="IBNSLayoutConstraint" id="689860785">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="509463058"/>
+								<reference key="secondItem" ref="996160987"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -683,7 +682,7 @@
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="1065146703">
-								<reference key="firstItem" ref="509463058"/>
+								<reference key="firstItem" ref="996160987"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1005"/>
@@ -698,7 +697,7 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="457141989">
+							<object class="IBNSLayoutConstraint" id="557216379">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
@@ -730,7 +729,7 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
 							</object>
-							<reference ref="509463058"/>
+							<reference ref="996160987"/>
 							<reference ref="60918609"/>
 						</array>
 						<reference key="parent" ref="0"/>
@@ -771,7 +770,7 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="26135717">
+							<object class="IBNSLayoutConstraint" id="217416544">
 								<reference key="firstItem" ref="222890410"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
@@ -1279,10 +1278,10 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">888</int>
-						<reference key="object" ref="509463058"/>
+						<reference key="object" ref="996160987"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="174157633">
-								<reference key="firstItem" ref="509463058"/>
+							<object class="IBNSLayoutConstraint" id="680904412">
+								<reference key="firstItem" ref="996160987"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="145041823"/>
@@ -1292,76 +1291,76 @@
 									<double key="value">11</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="509463058"/>
+								<reference key="containingView" ref="996160987"/>
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="190903341">
+							<object class="IBNSLayoutConstraint" id="700397535">
 								<reference key="firstItem" ref="145041823"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="223646588"/>
+								<reference key="secondItem" ref="366343837"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">6</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="509463058"/>
+								<reference key="containingView" ref="996160987"/>
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="67788141">
+							<object class="IBNSLayoutConstraint" id="32139976">
 								<reference key="firstItem" ref="145041823"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="509463058"/>
+								<reference key="secondItem" ref="996160987"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">16</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="509463058"/>
+								<reference key="containingView" ref="996160987"/>
 								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="779716407">
-								<reference key="firstItem" ref="223646588"/>
+							<object class="IBNSLayoutConstraint" id="255254776">
+								<reference key="firstItem" ref="366343837"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="509463058"/>
+								<reference key="secondItem" ref="996160987"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">16</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="509463058"/>
+								<reference key="containingView" ref="996160987"/>
 								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="316057462">
-								<reference key="firstItem" ref="223646588"/>
+							<object class="IBNSLayoutConstraint" id="650293569">
+								<reference key="firstItem" ref="366343837"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="509463058"/>
+								<reference key="secondItem" ref="996160987"/>
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">25</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="509463058"/>
+								<reference key="containingView" ref="996160987"/>
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
-							<reference ref="223646588"/>
+							<reference ref="366343837"/>
 							<reference ref="145041823"/>
 						</array>
 						<reference key="parent" ref="1005"/>
@@ -1373,7 +1372,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">893</int>
-						<reference key="object" ref="578526535"/>
+						<reference key="object" ref="689860785"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1382,7 +1381,7 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="168279901"/>
 						</array>
-						<reference key="parent" ref="509463058"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">531</int>
@@ -1391,55 +1390,55 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">894</int>
-						<reference key="object" ref="67788141"/>
-						<reference key="parent" ref="509463058"/>
+						<reference key="object" ref="32139976"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">879</int>
-						<reference key="object" ref="223646588"/>
+						<reference key="object" ref="366343837"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="524116018"/>
+							<reference ref="480309686"/>
 						</array>
-						<reference key="parent" ref="509463058"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">880</int>
-						<reference key="object" ref="524116018"/>
-						<reference key="parent" ref="223646588"/>
+						<reference key="object" ref="480309686"/>
+						<reference key="parent" ref="366343837"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">896</int>
-						<reference key="object" ref="316057462"/>
-						<reference key="parent" ref="509463058"/>
+						<reference key="object" ref="650293569"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">897</int>
-						<reference key="object" ref="779716407"/>
-						<reference key="parent" ref="509463058"/>
+						<reference key="object" ref="255254776"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">903</int>
-						<reference key="object" ref="557389775"/>
+						<reference key="object" ref="198070882"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">901</int>
-						<reference key="object" ref="174157633"/>
-						<reference key="parent" ref="509463058"/>
+						<reference key="object" ref="680904412"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">898</int>
-						<reference key="object" ref="190903341"/>
-						<reference key="parent" ref="509463058"/>
+						<reference key="object" ref="700397535"/>
+						<reference key="parent" ref="996160987"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">906</int>
-						<reference key="object" ref="426295361"/>
+						<reference key="object" ref="871081113"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">916</int>
-						<reference key="object" ref="26135717"/>
+						<reference key="object" ref="217416544"/>
 						<reference key="parent" ref="60918609"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1454,7 +1453,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">919</int>
-						<reference key="object" ref="457141989"/>
+						<reference key="object" ref="557216379"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 				</array>
@@ -1465,13 +1464,13 @@
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="1.IBNSViewMetadataConstraints">
 					<reference ref="1063893674"/>
-					<reference ref="457141989"/>
+					<reference ref="557216379"/>
 					<reference ref="1065146703"/>
-					<reference ref="578526535"/>
-					<reference ref="557389775"/>
+					<reference ref="689860785"/>
+					<reference ref="198070882"/>
 					<reference ref="989429017"/>
 					<reference ref="484547610"/>
-					<reference ref="426295361"/>
+					<reference ref="871081113"/>
 					<reference ref="213536579"/>
 				</array>
 				<boolean value="NO" key="1.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1513,7 +1512,7 @@
 					<reference ref="311160635"/>
 					<reference ref="437525640"/>
 					<reference ref="459585909"/>
-					<reference ref="26135717"/>
+					<reference ref="217416544"/>
 					<reference ref="920770187"/>
 					<reference ref="771059501"/>
 				</array>
@@ -1559,11 +1558,11 @@
 				<string key="879.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="880.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="888.IBNSViewMetadataConstraints">
-					<reference ref="316057462"/>
-					<reference ref="779716407"/>
-					<reference ref="67788141"/>
-					<reference ref="190903341"/>
-					<reference ref="174157633"/>
+					<reference ref="650293569"/>
+					<reference ref="255254776"/>
+					<reference ref="32139976"/>
+					<reference ref="700397535"/>
+					<reference ref="680904412"/>
 				</array>
 				<boolean value="NO" key="888.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m
index b7d45c3c..84b59b12 100644
--- a/MacPass/MPGeneralSettingsController.m
+++ b/MacPass/MPGeneralSettingsController.m
@@ -33,7 +33,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 - (void)didLoadView {
   NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController];
   NSString *reopenLastFilePath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyReopenLastDatabaseOnLaunch];
-  NSString *createUntitledOnActivatePaht = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyOpenEmptyDatabaseOnLaunch];
+  //NSString *createUntitledOnActivatePaht = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyOpenEmptyDatabaseOnLaunch];
   NSString *clearPasteboardKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyClearPasteboardOnQuit];
   NSString *clearPasteboardTimeOutKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyPasteboardClearTimeout];
   NSString *idleTimeOutKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyIdleLockTimeOut];
@@ -43,6 +43,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
   [self.lockOnSleepCheckButton bind:NSValueBinding toObject:defaultsController withKeyPath:lockOnSleepKeyPath options:nil];
   [self.idleTimeOutPopup bind:NSSelectedTagBinding toObject:defaultsController withKeyPath:idleTimeOutKeyPath options:nil];
   [self.reopenLastDatabase bind:NSValueBinding toObject:defaultsController withKeyPath:reopenLastFilePath options:nil];
-  [self.createUntitledOnActivation bind:NSValueBinding toObject:defaultsController withKeyPath:createUntitledOnActivatePaht options:nil];
+  [self.createUntitledOnActivation setState:NSOffState];
+  //[self.createUntitledOnActivation bind:NSValueBinding toObject:defaultsController withKeyPath:createUntitledOnActivatePaht options:nil];
 }
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 6f306107..fab09767 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -44,11 +44,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.5</string>
+	<string>0.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2516</string>
+	<string>2517</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>