diff --git a/capplet/vino-preferences.c b/capplet/vino-preferences.c
index 13615e2..8337af3 100644
--- a/capplet/vino-preferences.c
+++ b/capplet/vino-preferences.c
@@ -68,41 +68,21 @@ set_inverted (const GValue       *value,
   return g_variant_new_boolean (!g_value_get_boolean (value));
 }
 
-/* Next, one that maps between the array-of-strings list of
- * authentication mechanisms and a boolean that is FALSE if the 'none'
- * and TRUE otherwise (ie: for 'vnc' in the list).
- */
 static gboolean
-get_authtype (GValue   *value,
+get_vnc_auth (GValue   *value,
               GVariant *variant,
               gpointer  user_data)
 {
-  GVariantIter iter;
-  const gchar *type;
-
-  g_variant_iter_init (&iter, variant);
-  g_value_set_boolean (value, TRUE);
-
-  while (g_variant_iter_next (&iter, "s", &type))
-    if (strcmp (type, "none") == 0)
-      g_value_set_boolean (value, FALSE);
-
+  g_value_set_boolean (value, g_variant_get_boolean (variant));
   return TRUE;
 }
 
 static GVariant *
-set_authtype (const GValue       *value,
+set_vnc_auth (const GValue       *value,
               const GVariantType *type,
               gpointer            user_data)
 {
-  const gchar *authtype;
-
-  if (g_value_get_boolean (value))
-    authtype = "vnc";
-  else
-    authtype = "none";
-
-  return g_variant_new_strv (&authtype, 1);
+  return g_variant_new_boolean (g_value_get_boolean (value));
 }
 
 
@@ -349,8 +329,8 @@ vino_preferences_connect_ui (VinoPreferences *app,
 
     { "enabled",                "security_settings",     "sensitive", G_SETTINGS_BIND_GET,     NULL,                NULL                },
     { "prompt-enabled",         "prompt_enabled_toggle", "active",    G_SETTINGS_BIND_DEFAULT, NULL,                NULL                },
-    { "authentication-methods", "password_toggle",       "active",    G_SETTINGS_BIND_DEFAULT, get_authtype,        set_authtype        },
-    { "authentication-methods", "password_box",          "sensitive", G_SETTINGS_BIND_GET,     get_authtype,        NULL                },
+    { "vnc-authentication", "password_toggle",       "active",        G_SETTINGS_BIND_DEFAULT, get_vnc_auth,        set_vnc_auth        },
+    { "vnc-authentication", "password_box",          "sensitive",     G_SETTINGS_BIND_GET,     get_vnc_auth,        NULL                },
     { "vnc-password",           "password_entry",        "text",      G_SETTINGS_BIND_DEFAULT, get_password,        set_password        },
     { "use-upnp",               "use_upnp_toggle",       "active",    G_SETTINGS_BIND_DEFAULT, NULL,                NULL                },
 
diff --git a/common/org.gnome.Vino.gschema.xml b/common/org.gnome.Vino.gschema.xml
index 16b1b35..6df2043 100644
--- a/common/org.gnome.Vino.gschema.xml
+++ b/common/org.gnome.Vino.gschema.xml
@@ -72,22 +72,15 @@
       <default>false</default>
     </key>
 
-    <key name='authentication-methods' type='as'>
-      <summary>Allowed authentication methods</summary>
+    <key name='vnc-authentication' type='b'>
+      <summary>Enable authentication</summary>
       <description>
-        Lists the authentication methods with which remote users may
-        access the desktop.
-
-        There are two possible authentication methods; "vnc" causes the
+        Enable VNC authentication method. This will force a 
         remote user to be prompted for a password (the password is
-        specified by the vnc-password key) before connecting and "none"
-        which allows any remote user to connect.
+        specified by the vnc-password key) before connecting, and
+        disabling this will allows any remote user to connect.
       </description>
-      <choices>
-        <choice value='none'/>
-        <choice value='vnc'/>
-      </choices>
-      <default>['none']</default>
+      <default>false</default>
     </key>
 
     <key name='vnc-password' type='s'>
diff --git a/server/vino-main.c b/server/vino-main.c
index 4d62455..6385759 100644
--- a/server/vino-main.c
+++ b/server/vino-main.c
@@ -227,8 +227,8 @@ name_acquired (GDBusConnection *connection,
                        server, "use-alternative-port", G_SETTINGS_BIND_GET);
       g_settings_bind (vino->settings, "alternative-port",
                        server, "alternative-port", G_SETTINGS_BIND_GET);
-      g_settings_bind (vino->settings, "authentication-methods",
-                       server, "auth-methods", G_SETTINGS_BIND_GET);
+      g_settings_bind (vino->settings, "vnc-authentication",
+                       server, "vnc-auth", G_SETTINGS_BIND_GET);
       g_settings_bind (vino->settings, "require-encryption",
                        server, "require-encryption", G_SETTINGS_BIND_GET);
       g_settings_bind (vino->settings, "require-encryption",
diff --git a/server/vino-prefs.c b/server/vino-prefs.c
index 3aca534..83c0a7b 100644
--- a/server/vino-prefs.c
+++ b/server/vino-prefs.c
@@ -75,8 +75,8 @@ vino_prefs_create_server (GdkScreen *screen)
                    server, "use-alternative-port", G_SETTINGS_BIND_GET);
   g_settings_bind (settings, "alternative-port",
                    server, "alternative-port", G_SETTINGS_BIND_GET);
-  g_settings_bind (settings, "authentication-methods",
-                   server, "auth-methods", G_SETTINGS_BIND_GET);
+  g_settings_bind (settings, "vnc-authentication",
+                   server, "vnc-auth", G_SETTINGS_BIND_GET);
   g_settings_bind (settings, "require-encryption",
                    server, "require-encryption", G_SETTINGS_BIND_GET);
   g_settings_bind (settings, "require-encryption",
diff --git a/server/vino-server.c b/server/vino-server.c
index b61b3b9..efa5e77 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -67,7 +67,7 @@ struct _VinoServerPrivate
 
   GSList           *clients;
 
-  VinoAuthMethod    auth_methods;
+  gboolean          vnc_auth;
   char             *vnc_password;
 
 #ifdef VINO_ENABLE_HTTP_SERVER
@@ -117,7 +117,7 @@ enum
   PROP_USE_ALTERNATIVE_PORT,
   PROP_ALTERNATIVE_PORT,
   PROP_REQUIRE_ENCRYPTION,
-  PROP_AUTH_METHODS,
+  PROP_VNC_AUTH,
   PROP_VNC_PASSWORD,
   PROP_PORT,
   PROP_LOCK_SCREEN,
@@ -708,7 +708,7 @@ vino_server_auth_client (VinoServer *server,
   rfbClientPtr  rfb_client;
   char         *password;
 
-  if (!(server->priv->auth_methods & VINO_AUTH_VNC))
+  if (!(server->priv->vnc_auth))
     goto auth_failed;
 
   if (!(password = vino_server_get_password_from_keyring (server)))
@@ -1161,8 +1161,8 @@ vino_server_set_property (GObject      *object,
     case PROP_REQUIRE_ENCRYPTION:
       vino_server_set_require_encryption (server, g_value_get_boolean (value));
       break;
-    case PROP_AUTH_METHODS:
-      vino_server_set_auth_methods (server, g_value_get_flags (value));
+    case PROP_VNC_AUTH:
+      vino_server_set_vnc_auth (server, g_value_get_boolean (value));
       break;
     case PROP_VNC_PASSWORD:
       vino_server_set_vnc_password (server, g_value_get_string (value));
@@ -1228,8 +1228,8 @@ vino_server_get_property (GObject    *object,
     case PROP_REQUIRE_ENCRYPTION:
       g_value_set_boolean (value, server->priv->require_encryption);
       break;
-    case PROP_AUTH_METHODS:
-      g_value_set_flags (value, server->priv->auth_methods);
+    case PROP_VNC_AUTH:
+      g_value_set_boolean (value, server->priv->vnc_auth);
       break;
     case PROP_VNC_PASSWORD:
       g_value_set_string (value, server->priv->vnc_password);
@@ -1381,17 +1381,16 @@ vino_server_class_init (VinoServerClass *klass)
                                                          G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (gobject_class,
-				   PROP_AUTH_METHODS,
-				   g_param_spec_flags ("auth-methods",
-						       "Authentication methods",
-						       "The authentication methods this server should allow",
-						       VINO_TYPE_AUTH_METHOD,
-						       VINO_AUTH_NONE,
-                                                       G_PARAM_READWRITE   |
-                                                       G_PARAM_CONSTRUCT   |
-                                                       G_PARAM_STATIC_NAME |
-                                                       G_PARAM_STATIC_NICK |
-                                                       G_PARAM_STATIC_BLURB));
+				   PROP_VNC_AUTH,
+				   g_param_spec_boolean ("vnc-auth",
+						        "VNC Authentication",
+						        "VNC authentication will be enabled",
+						        FALSE,
+                                                        G_PARAM_READWRITE   |
+                                                        G_PARAM_CONSTRUCT   |
+                                                        G_PARAM_STATIC_NAME |
+                                                        G_PARAM_STATIC_NICK |
+                                                        G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (gobject_class,
 				   PROP_VNC_PASSWORD,
@@ -1745,7 +1744,7 @@ vino_server_update_security_types (VinoServer *server)
   rfbAddSecurityType (server->priv->rfb_screen, rfbTLS);
 #endif
       
-  if (server->priv->auth_methods & VINO_AUTH_VNC)
+  if (server->priv->vnc_auth)
     {
       rfbAddAuthType (server->priv->rfb_screen, rfbVncAuth);
 #ifdef VINO_HAVE_GNUTLS
@@ -1753,8 +1752,7 @@ vino_server_update_security_types (VinoServer *server)
 #endif
 	rfbAddSecurityType (server->priv->rfb_screen, rfbVncAuth);
     }
-      
-  if (server->priv->auth_methods & VINO_AUTH_NONE)
+  else    
     {
       rfbAddAuthType (server->priv->rfb_screen, rfbNoAuth);
 #ifdef VINO_HAVE_GNUTLS
@@ -1790,28 +1788,25 @@ vino_server_get_require_encryption (VinoServer *server)
 }
 
 void
-vino_server_set_auth_methods (VinoServer     *server,
-			      VinoAuthMethod  auth_methods)
+vino_server_set_vnc_auth (VinoServer  *server,
+			  gboolean     vnc_auth)
 {
   g_return_if_fail (VINO_IS_SERVER (server));
-  g_return_if_fail (auth_methods != VINO_AUTH_INVALID);
 
-  if (server->priv->auth_methods != auth_methods)
+  if (server->priv->vnc_auth != vnc_auth)
     {
-      server->priv->auth_methods = auth_methods;
+      server->priv->vnc_auth = vnc_auth;
 
       vino_server_update_security_types (server);
 
-      g_object_notify (G_OBJECT (server), "auth-methods");
+      g_object_notify (G_OBJECT (server), "vnc-auth");
     }
 }
 
-VinoAuthMethod
-vino_server_get_auth_methods (VinoServer *server)
+gboolean
+vino_server_get_vnc_auth (VinoServer *server)
 {
-  g_return_val_if_fail (VINO_IS_SERVER (server), VINO_AUTH_INVALID);
-
-  return server->priv->auth_methods;
+  return server->priv->vnc_auth;
 }
 
 void
diff --git a/server/vino-server.h b/server/vino-server.h
index 01fa19e..c4cc362 100644
--- a/server/vino-server.h
+++ b/server/vino-server.h
@@ -46,13 +46,6 @@ typedef struct _VinoServerClass   VinoServerClass;
 typedef struct _VinoServerPrivate VinoServerPrivate;
 typedef struct _VinoClient        VinoClient;
 
-typedef enum
-{
-  VINO_AUTH_INVALID = 0,
-  VINO_AUTH_NONE    = 1 << 0,
-  VINO_AUTH_VNC     = 1 << 1
-} VinoAuthMethod;
-
 struct _VinoServer
 {
   GObject            base;
@@ -99,9 +92,9 @@ const char          *vino_server_get_network_interface    (VinoServer     *serve
 void                 vino_server_set_require_encryption   (VinoServer     *server,
 							   gboolean        require_encryption);
 gboolean             vino_server_get_require_encryption   (VinoServer     *server);
-void                 vino_server_set_auth_methods         (VinoServer     *server,
-							   VinoAuthMethod  auth_methods);
-VinoAuthMethod       vino_server_get_auth_methods         (VinoServer     *server);
+void                 vino_server_set_vnc_auth             (VinoServer     *server,
+							   gboolean        vnc_auth);
+gboolean             vino_server_get_vnc_auth             (VinoServer     *server);
 void                 vino_server_set_vnc_password         (VinoServer     *server,
 							   const char     *vnc_password);
 const char          *vino_server_get_vnc_password         (VinoServer     *server);
diff --git a/server/vino-tube-servers-manager.c b/server/vino-tube-servers-manager.c
index 28ae703..4ea02aa 100644
--- a/server/vino-tube-servers-manager.c
+++ b/server/vino-tube-servers-manager.c
@@ -224,7 +224,7 @@ handle_channels_cb (TpSimpleHandler *handler,
       "network-interface",    network_interface,
       "use-alternative-port", 1,
       "alternative-port",     self->priv->alternative_port,
-      "auth-methods",         1,
+      "vnc-authentication",   1,
       "require-encryption",   0,
       "vnc-password",         NULL,
       "on-hold",              0,
