diff --git a/apps/aqhome-cgi/modules/common/madmin.c b/apps/aqhome-cgi/modules/common/madmin.c
index 429ec24..b67f382 100644
--- a/apps/aqhome-cgi/modules/common/madmin.c
+++ b/apps/aqhome-cgi/modules/common/madmin.c
@@ -99,7 +99,7 @@ void _createPermDefList(AQH_MODULE *m)
 void _createRoleList(AQH_MODULE *m)
 {
   AQH_ROLE_LIST *roleList;
-  int id=0;
+  int id=1;
 
   roleList=AQH_Role_List_new();
   AQH_ModService_AddRole(roleList, id++, "userAdmin",   AQH_MODADM_PERMS_ADMINUSERS,   "User administrator");
diff --git a/apps/aqhome-cgi/modules/common/mmodules.c b/apps/aqhome-cgi/modules/common/mmodules.c
index 8458b9a..8d3eba5 100644
--- a/apps/aqhome-cgi/modules/common/mmodules.c
+++ b/apps/aqhome-cgi/modules/common/mmodules.c
@@ -140,7 +140,7 @@ void _createPermDefList(AQH_MODULE *m)
 void _createRoleList(AQH_MODULE *m)
 {
   AQH_ROLE_LIST *roleList;
-  int id=0;
+  int id=1;
 
   roleList=AQH_Role_List_new();
   AQH_ModService_AddRole(roleList, id++, "admin",
diff --git a/apps/aqhome-cgi/modules/common/musers.c b/apps/aqhome-cgi/modules/common/musers.c
index 2c6dfe0..2514200 100644
--- a/apps/aqhome-cgi/modules/common/musers.c
+++ b/apps/aqhome-cgi/modules/common/musers.c
@@ -143,7 +143,7 @@ void _createPermDefList(AQH_MODULE *m)
 void _createRoleList(AQH_MODULE *m)
 {
   AQH_ROLE_LIST *roleList;
-  int id=0;
+  int id=1;
 
   roleList=AQH_Role_List_new();
   AQH_ModService_AddRole(roleList, id++, "admin",
@@ -587,9 +587,12 @@ void _readModRolesFromForm(GWEN_DB_NODE *dbPost,
 
         GBAS(tbuf, roleName);
         s=GWEN_DB_GetCharValue(dbPost, GWEN_Buffer_GetStart(tbuf), 0, NULL);
+        /*DBG_ERROR(NULL, "Role string %s = [%s]", GWEN_Buffer_GetStart(tbuf), s?s:"<empty>");*/
         if (s && *s) {
-          if (nextRolePos<AQH_ModulePerms_GetRoleArrayArraySize())
-            AQH_ModulePerms_SetRoleArrayAt(modPerms, nextRolePos++, AQH_Role_GetId(role));
+	  if (nextRolePos<AQH_ModulePerms_GetRoleArrayArraySize()) {
+            /*DBG_ERROR(NULL, "Setting role \"%s\" (%d)", roleName, AQH_Role_GetId(role));*/
+	    AQH_ModulePerms_SetRoleArrayAt(modPerms, nextRolePos++, AQH_Role_GetId(role));
+	  }
         }
         GWEN_Buffer_Crop(tbuf, 0, pos);
       }
diff --git a/apps/aqhome-cgi/modules/devices/mdevices_init.c b/apps/aqhome-cgi/modules/devices/mdevices_init.c
index f35f480..6755b5c 100644
--- a/apps/aqhome-cgi/modules/devices/mdevices_init.c
+++ b/apps/aqhome-cgi/modules/devices/mdevices_init.c
@@ -98,7 +98,7 @@ void _createPermDefList(AQH_MODULE *m)
 void _createRoleList(AQH_MODULE *m)
 {
   AQH_ROLE_LIST *roleList;
-  int id=0;
+  int id=1;
 
   roleList=AQH_Role_List_new();
   AQH_ModService_AddRole(roleList, id++, "Reader",
diff --git a/apps/aqhome-cgi/service_file.c b/apps/aqhome-cgi/service_file.c
index 5f5d6c3..f4b8aca 100644
--- a/apps/aqhome-cgi/service_file.c
+++ b/apps/aqhome-cgi/service_file.c
@@ -170,7 +170,7 @@ int _saveUser(AQH_SERVICE *sv, AQH_USER *user)
       return rv;
     }
 
-    //_logGroup(AQH_SERVICE_FILE_GROUP_USERS, s, db);
+    /*_logGroup(AQH_SERVICE_FILE_GROUP_USERS, s, db);*/
 
     rv=_saveGroupLocked(sv, AQH_SERVICE_FILE_GROUP_USERS, s, db);
     if (rv<0) {