diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java
index 7f499cf8..d95f5f1f 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java
@@ -28,8 +28,12 @@ public abstract class AuthenticationPanel extends JPanel {
         add( Box.createVerticalGlue() );
     }
 
-    protected void updateUser() {
+    protected void updateUser(boolean repack) {
         unlockFrame.setUser( getUser() );
+        validate();
+
+        if (repack)
+            unlockFrame.repack();
     }
 
     protected abstract User getUser();
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java
index 36f3244f..05d84481 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java
@@ -1,6 +1,6 @@
 package com.lyndir.lhunath.masterpassword;
 
-import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
@@ -12,14 +12,18 @@ import java.io.*;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 
 
 /**
  * @author lhunath, 2014-06-11
  */
-public class ConfigAuthenticationPanel extends AuthenticationPanel implements ItemListener, ActionListener {
+public class ConfigAuthenticationPanel extends AuthenticationPanel implements ItemListener, ActionListener, DocumentListener {
 
-    private final JComboBox userField;
+    private final JComboBox      userField;
+    private final JLabel         masterPasswordLabel;
+    private final JPasswordField masterPasswordField;
 
     public ConfigAuthenticationPanel(final UnlockFrame unlockFrame) {
 
@@ -41,11 +45,51 @@ public class ConfigAuthenticationPanel extends AuthenticationPanel implements It
         userField.addItemListener( this );
         userField.addActionListener( this );
         add( userField );
+
+        // Master Password
+        masterPasswordLabel = new JLabel( "Master Password:" );
+        masterPasswordLabel.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordLabel.setHorizontalAlignment( SwingConstants.CENTER );
+        masterPasswordLabel.setVerticalAlignment( SwingConstants.BOTTOM );
+        add( masterPasswordLabel );
+
+        masterPasswordField = new JPasswordField() {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+        masterPasswordField.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordField.addActionListener( this );
+        masterPasswordField.getDocument().addDocumentListener( this );
+        add( masterPasswordField );
+    }
+
+    @Override
+    public Component getFocusComponent() {
+        return masterPasswordField.isVisible()? masterPasswordField: null;
+    }
+
+    @Override
+    protected void updateUser(boolean repack) {
+        boolean masterPasswordMissing = userField.getSelectedItem() == null || !((User) userField.getSelectedItem()).hasKey();
+        if (masterPasswordField.isVisible() != masterPasswordMissing) {
+            masterPasswordLabel.setVisible( masterPasswordMissing );
+            masterPasswordField.setVisible( masterPasswordMissing );
+            repack = true;
+        }
+
+        super.updateUser( repack );
     }
 
     @Override
     protected User getUser() {
-        return (User) userField.getSelectedItem();
+        User selectedUser = (User) userField.getSelectedItem();
+        if (selectedUser.hasKey()) {
+            return selectedUser;
+        }
+
+        return new User( selectedUser.getName(), new String( masterPasswordField.getPassword() ) );
     }
 
     public String getHelpText() {
@@ -94,12 +138,27 @@ public class ConfigAuthenticationPanel extends AuthenticationPanel implements It
 
     @Override
     public void itemStateChanged(final ItemEvent e) {
-        updateUser();
+        updateUser( false );
     }
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        updateUser();
+        updateUser( false );
         unlockFrame.trySignIn( userField );
     }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
 }
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java
index 9a1e2edf..098f8827 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java
@@ -1,7 +1,8 @@
 package com.lyndir.lhunath.masterpassword;
 
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -12,7 +13,7 @@ import javax.swing.event.DocumentListener;
  */
 public class TextAuthenticationPanel extends AuthenticationPanel implements DocumentListener, ActionListener {
 
-    private final JTextField userNameField;
+    private final JTextField     userNameField;
     private final JPasswordField masterPasswordField;
 
     public TextAuthenticationPanel(final UnlockFrame unlockFrame) {
@@ -67,22 +68,22 @@ public class TextAuthenticationPanel extends AuthenticationPanel implements Docu
 
     @Override
     public void insertUpdate(final DocumentEvent e) {
-        updateUser();
+        updateUser( false );
     }
 
     @Override
     public void removeUpdate(final DocumentEvent e) {
-        updateUser();
+        updateUser( false );
     }
 
     @Override
     public void changedUpdate(final DocumentEvent e) {
-        updateUser();
+        updateUser( false );
     }
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        updateUser();
-        unlockFrame.trySignIn(userNameField,masterPasswordField );
+        updateUser( false );
+        unlockFrame.trySignIn( userNameField, masterPasswordField );
     }
 }
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java
index 10f0b889..52a33883 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java
@@ -53,7 +53,7 @@ public class UnlockFrame extends JFrame {
         setLocationRelativeTo( null );
     }
 
-    private void repack() {
+    protected void repack() {
         setPreferredSize( null );
         pack();
         setMinimumSize( getSize() );
@@ -70,7 +70,7 @@ public class UnlockFrame extends JFrame {
         } else {
             authenticationPanel = new TextAuthenticationPanel( this );
         }
-        authenticationPanel.updateUser();
+        authenticationPanel.updateUser( false );
         authenticationContainer.add( authenticationPanel, BorderLayout.CENTER );
 
         final JCheckBox typeCheckBox = new JCheckBox( "Use Config File" );
diff --git a/Site/2013-05/masterpassword-gui.jar b/Site/2013-05/masterpassword-gui.jar
index 6da6bcab..3e001056 100644
Binary files a/Site/2013-05/masterpassword-gui.jar and b/Site/2013-05/masterpassword-gui.jar differ