diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index e3ab176..736994b 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -877,6 +877,7 @@
     options.acceptClipboard.setSelected(viewer.acceptClipboard.getValue());
     options.sendClipboard.setSelected(viewer.sendClipboard.getValue());
     options.menuKey.setSelectedItem(KeyEvent.getKeyText(menukey.getMenuKeyCode()));
+    options.sendLocalUsername.setSelected(viewer.sendLocalUsername.getValue());
 
     if (state() == RFBSTATE_NORMAL) {
       options.shared.setEnabled(false);
@@ -921,11 +922,9 @@
           switch ((Integer)iext.next()) {
           case Security.secTypePlain:
             options.secPlain.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           case Security.secTypeIdent:
             options.secIdent.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           case Security.secTypeTLSNone:
             options.encTLS.setSelected(true);
@@ -938,12 +937,10 @@
           case Security.secTypeTLSPlain:
             options.encTLS.setSelected(true);
             options.secPlain.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           case Security.secTypeTLSIdent:
             options.encTLS.setSelected(true);
             options.secIdent.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           case Security.secTypeX509None:
             options.encX509.setSelected(true);
@@ -956,12 +953,10 @@
           case Security.secTypeX509Plain:
             options.encX509.setSelected(true);
             options.secPlain.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           case Security.secTypeX509Ident:
             options.encX509.setSelected(true);
             options.secIdent.setSelected(true);
-            options.sendLocalUsername.setSelected(true);
             break;
           }
         }