diff --git a/src/lightdm-webkit2-greeter-ext.c b/src/lightdm-webkit2-greeter-ext.c
index 7e66d12..1ef5efc 100644
--- a/src/lightdm-webkit2-greeter-ext.c
+++ b/src/lightdm-webkit2-greeter-ext.c
@@ -1298,37 +1298,37 @@ static const JSStaticValue lightdm_session_values[] = {
 	{NULL,      NULL,                   NULL, 0}};
 
 static const JSStaticValue lightdm_greeter_values[] = {
-	{"authentication_user", get_authentication_user_cb, NULL,          kJSPropertyAttributeReadOnly},
-	{"autologin_guest",     get_autologin_guest_cb,     NULL,          kJSPropertyAttributeReadOnly},
-	{"autologin_timeout",   get_autologin_timeout_cb,   NULL,          kJSPropertyAttributeReadOnly},
-	{"autologin_user",      get_autologin_user_cb,      NULL,          kJSPropertyAttributeReadOnly},
-	{"can_hibernate",       get_can_hibernate_cb,       NULL,          kJSPropertyAttributeReadOnly},
-	{"can_restart",         get_can_restart_cb,         NULL,          kJSPropertyAttributeReadOnly},
-	{"can_shutdown",        get_can_shutdown_cb,        NULL,          kJSPropertyAttributeReadOnly},
-	{"can_suspend",         get_can_suspend_cb,         NULL,          kJSPropertyAttributeReadOnly},
-	{"default_session",     get_default_session_cb,     NULL,          kJSPropertyAttributeReadOnly},
-	{"has_guest_account",   get_has_guest_account_cb,   NULL,          kJSPropertyAttributeReadOnly},
-	{"hide_users",          get_hide_users_cb,          NULL,          kJSPropertyAttributeReadOnly},
-	{"hostname",            get_hostname_cb,            NULL,          kJSPropertyAttributeReadOnly},
-	{"in_authentication",   get_in_authentication_cb,   NULL,          kJSPropertyAttributeReadOnly},
-	{"is_authenticated",    get_is_authenticated_cb,    NULL,          kJSPropertyAttributeReadOnly},
+	{"authentication_user", get_authentication_user_cb, NULL,            kJSPropertyAttributeReadOnly},
+	{"autologin_guest",     get_autologin_guest_cb,     NULL,            kJSPropertyAttributeReadOnly},
+	{"autologin_timeout",   get_autologin_timeout_cb,   NULL,            kJSPropertyAttributeReadOnly},
+	{"autologin_user",      get_autologin_user_cb,      NULL,            kJSPropertyAttributeReadOnly},
+	{"can_hibernate",       get_can_hibernate_cb,       NULL,            kJSPropertyAttributeReadOnly},
+	{"can_restart",         get_can_restart_cb,         NULL,            kJSPropertyAttributeReadOnly},
+	{"can_shutdown",        get_can_shutdown_cb,        NULL,            kJSPropertyAttributeReadOnly},
+	{"can_suspend",         get_can_suspend_cb,         NULL,            kJSPropertyAttributeReadOnly},
+	{"default_session",     get_default_session_cb,     NULL,            kJSPropertyAttributeReadOnly},
+	{"has_guest_account",   get_has_guest_account_cb,   NULL,            kJSPropertyAttributeReadOnly},
+	{"hide_users",          get_hide_users_cb,          NULL,            kJSPropertyAttributeReadOnly},
+	{"hostname",            get_hostname_cb,            NULL,            kJSPropertyAttributeReadOnly},
+	{"in_authentication",   get_in_authentication_cb,   NULL,            kJSPropertyAttributeReadOnly},
+	{"is_authenticated",    get_is_authenticated_cb,    NULL,            kJSPropertyAttributeReadOnly},
 	{"language",            get_language_cb,            NULL,          kJSPropertyAttributeReadOnly},
-	{"languages",           get_languages_cb,           NULL,          kJSPropertyAttributeReadOnly},
-	{"layout",              get_layout_cb,              set_layout_cb, kJSPropertyAttributeNone},
-	{"layouts",             get_layouts_cb,             NULL,          kJSPropertyAttributeReadOnly},
-	{"lock_hint",           get_lock_hint_cb,           NULL,          kJSPropertyAttributeReadOnly},
-	{"num_users",           get_num_users_cb,           NULL,          kJSPropertyAttributeReadOnly},
-	{"select_guest",        get_select_guest_hint_cb,   NULL,          kJSPropertyAttributeReadOnly},
-	{"select_user",         get_select_user_hint_cb,    NULL,          kJSPropertyAttributeReadOnly},
-	{"sessions",            get_sessions_cb,            NULL,          kJSPropertyAttributeReadOnly},
-	{"users",               get_users_cb,               NULL,          kJSPropertyAttributeReadOnly},
+	{"languages",           get_languages_cb,           NULL,            kJSPropertyAttributeReadOnly},
+	{"layout",              get_layout_cb,              set_layout_cb,   kJSPropertyAttributeNone},
+	{"layouts",             get_layouts_cb,             NULL,            kJSPropertyAttributeReadOnly},
+	{"lock_hint",           get_lock_hint_cb,           NULL,            kJSPropertyAttributeReadOnly},
+	{"num_users",           get_num_users_cb,           NULL,            kJSPropertyAttributeReadOnly},
+	{"select_guest",        get_select_guest_hint_cb,   NULL,            kJSPropertyAttributeReadOnly},
+	{"select_user",         get_select_user_hint_cb,    NULL,            kJSPropertyAttributeReadOnly},
+	{"sessions",            get_sessions_cb,            NULL,            kJSPropertyAttributeReadOnly},
+	{"users",               get_users_cb,               NULL,            kJSPropertyAttributeReadOnly},
 	/* ------>>> DEPRECATED! <<<----------->>> DEPRECATED! <<<------------>>> DEPRECATED! <<<------*/
-	{"default_language",    get_language_cb,            NULL,          kJSPropertyAttributeReadOnly},
-	{"default_layout",      get_layout_cb,              NULL,          kJSPropertyAttributeReadOnly},
-	{"timed_login_delay",   get_autologin_timeout_cb,   NULL,          kJSPropertyAttributeReadOnly},
-	{"timed_login_user",    get_autologin_user_cb,      NULL,          kJSPropertyAttributeReadOnly},
+	{"default_language",    get_language_cb,            NULL,            kJSPropertyAttributeReadOnly},
+	{"default_layout",      get_layout_cb,              NULL,            kJSPropertyAttributeReadOnly},
+	{"timed_login_delay",   get_autologin_timeout_cb,   NULL,            kJSPropertyAttributeReadOnly},
+	{"timed_login_user",    get_autologin_user_cb,      NULL,            kJSPropertyAttributeReadOnly},
 	/* ------>>> DEPRECATED! <<<----------->>> DEPRECATED! <<<------------>>> DEPRECATED! <<<------*/
-	{NULL,                  NULL,                       NULL,          0}};
+	{NULL,                  NULL,                       NULL,            0}};
 
 static const JSStaticFunction lightdm_greeter_functions[] = {
 	{"authenticate",          authenticate_cb,          kJSPropertyAttributeReadOnly},
diff --git a/themes/_vendor/js/mock.js b/themes/_vendor/js/mock.js
index 4094643..9926ad0 100644
--- a/themes/_vendor/js/mock.js
+++ b/themes/_vendor/js/mock.js
@@ -469,7 +469,7 @@ class LightDMGreeter {
 	 * @readonly
 	 */
 	get num_users() {
-		return this._num_users;
+		return this.users.length;
 	}
 
 	/**