Index: dll/cpl/usrmgr/groups.c
===================================================================
--- dll/cpl/usrmgr/groups.c	(revision 58718)
+++ dll/cpl/usrmgr/groups.c	(working copy)
@@ -477,6 +477,7 @@
             switch (LOWORD(wParam))
             {
                 case IDM_GROUP_NEW:
+				case IDC_GROUPS_ADD:
                     GroupNew(hwndDlg);
                     break;
 
@@ -485,10 +486,12 @@
                     break;
 
                 case IDM_GROUP_DELETE:
+				case IDC_GROUPS_REMOVE:
                     GroupDelete(hwndDlg);
                     break;
 
                 case IDM_GROUP_PROPERTIES:
+				case IDC_GROUPS_PROPERTIES:
                     if (GroupProperties(hwndDlg) == IDOK)
                         UpdateGroupProperties(hwndDlg);
                     break;
Index: dll/cpl/usrmgr/lang/de-DE.rc
===================================================================
--- dll/cpl/usrmgr/lang/de-DE.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/de-DE.rc	(working copy)
@@ -14,6 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED, 100, 16
 END
 
 
@@ -24,6 +29,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/en-US.rc
===================================================================
--- dll/cpl/usrmgr/lang/en-US.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/en-US.rc	(working copy)
@@ -14,6 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -24,6 +29,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/es-ES.rc
===================================================================
--- dll/cpl/usrmgr/lang/es-ES.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/es-ES.rc	(working copy)
@@ -10,6 +10,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd..", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -20,6 +25,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/fr-FR.rc
===================================================================
--- dll/cpl/usrmgr/lang/fr-FR.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/fr-FR.rc	(working copy)
@@ -10,6 +10,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -20,6 +25,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/he-IL.rc
===================================================================
--- dll/cpl/usrmgr/lang/he-IL.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/he-IL.rc	(working copy)
@@ -14,6 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -24,6 +29,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/pl-PL.rc
===================================================================
--- dll/cpl/usrmgr/lang/pl-PL.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/pl-PL.rc	(working copy)
@@ -18,6 +18,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -28,6 +33,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/ro-RO.rc
===================================================================
--- dll/cpl/usrmgr/lang/ro-RO.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/ro-RO.rc	(working copy)
@@ -10,6 +10,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -20,6 +25,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/ru-RU.rc
===================================================================
--- dll/cpl/usrmgr/lang/ru-RU.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/ru-RU.rc	(working copy)
@@ -14,6 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -24,6 +29,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/lang/uk-UA.rc
===================================================================
--- dll/cpl/usrmgr/lang/uk-UA.rc	(revision 58718)
+++ dll/cpl/usrmgr/lang/uk-UA.rc	(working copy)
@@ -14,6 +14,11 @@
 BEGIN
     CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+	PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
+	PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
+	PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
+	AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+	PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED
 END
 
 
@@ -24,6 +29,9 @@
 BEGIN
     CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
             7, 7, 238, 85, WS_EX_CLIENTEDGE
+    PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14
+    PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14
+    PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14
 END
 
 
Index: dll/cpl/usrmgr/resource.h
===================================================================
--- dll/cpl/usrmgr/resource.h	(revision 58718)
+++ dll/cpl/usrmgr/resource.h	(working copy)
@@ -42,6 +42,16 @@
 #define IDC_USER_GENERAL_DISABLED      317
 #define IDC_USER_GENERAL_LOCKED        318
 
+#define IDC_USERS_ADD                  319
+#define IDC_USERS_REMOVE               320
+#define IDC_USERS_PROPERTIES           321
+#define IDC_USERS_STARTUP_REQUIRE      322
+#define IDC_USERS_ADMIN_RESET          323
+
+#define IDC_GROUPS_ADD                 324
+#define IDC_GROUPS_REMOVE              325
+#define IDC_GROUPS_PROPERTIES          326
+
 #define IDD_GROUP_GENERAL              340
 #define IDC_GROUP_GENERAL_NAME         341
 #define IDC_GROUP_GENERAL_DESCRIPTION  342
Index: dll/cpl/usrmgr/users.c
===================================================================
--- dll/cpl/usrmgr/users.c	(revision 58718)
+++ dll/cpl/usrmgr/users.c	(working copy)
@@ -675,14 +675,17 @@
                     break;
 
                 case IDM_USER_NEW:
+                case IDC_USERS_ADD:
                     UserNew(hwndDlg);
                     break;
 
                 case IDM_USER_DELETE:
+                case IDC_USERS_REMOVE:
                     UserDelete(hwndDlg);
                     break;
 
                 case IDM_USER_PROPERTIES:
+                case IDC_USERS_PROPERTIES:
                     if (UserProperties(hwndDlg))
                     {
                         UpdateUserProperties(hwndDlg);