diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 6f184a4e..592d5614 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -511,12 +511,10 @@ typedef NS_ENUM(NSUInteger, MPAlertType) {
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-  NSLog(@"Valdiate MenuItem:%@", [menuItem title]);
   return [self validateUserInterfaceItem:menuItem];
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
-    NSLog(@"Valdiate ToolbarItem:%@", [theItem label]);
   return [self validateUserInterfaceItem:theItem];
 }
 
diff --git a/MacPass/MPPasswordEditWindowController.m b/MacPass/MPPasswordEditWindowController.m
index 049c9dde..487a0200 100644
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -87,7 +87,9 @@
 
 #pragma mark Actions
 - (IBAction)save:(id)sender {
-  [_currentDocument changePassword:[self.passwordTextField stringValue] keyFileURL:[self.keyfilePathControl URL]];
+  const BOOL hasPassword = ([self.hasPasswordSwitchButton state] == NSOnState);
+  NSString *password = hasPassword ? [self.passwordTextField stringValue] : nil;
+  [_currentDocument changePassword:password keyFileURL:[self.keyfilePathControl URL]];
   [self dismissSheet:NSRunStoppedResponse];
   if(self.delegate && [self.delegate respondsToSelector:@selector(didFinishPasswordEditing:)]) {
     [self.delegate didFinishPasswordEditing:YES];
diff --git a/MacPass/MPToolbarItem.m b/MacPass/MPToolbarItem.m
index 4992f857..c59728a8 100644
--- a/MacPass/MPToolbarItem.m
+++ b/MacPass/MPToolbarItem.m
@@ -16,7 +16,6 @@
     id target = [NSApp targetForAction:[self action] to:nil from:self];
     BOOL isValid = (nil != target);
     id validateTarget = [NSApp targetForAction:@selector(validateToolbarItem:) to:nil from:self];
-    //NSLog(@"Validation for ToolbarItem:%@", [validateTarget class]);
     if(validateTarget) {
       isValid &= [validateTarget validateToolbarItem:self];
     }