1 files changed, 8 insertions, 3 deletions

diff --git a/noncore/settings/usermanager/passwd.cpp b/noncore/settings/usermanager/passwd.cpp
index 1e98778..f8e6d17 100644
--- a/noncore/settings/usermanager/passwd.cpp
+++ b/noncore/settings/usermanager/passwd.cpp
@@ -204,16 +204,21 @@ bool Passwd::delUser(int uid, bool delGroup) {
 // Locate a group in the groupStringList, fill out the gr_* variables and return "true" if found.
 bool Passwd::searchGroup(QRegExp &groupRegExp) {
         QStringList tempStringList(groupStringList.grep(groupRegExp));
         if((tempStringList.isEmpty())) {
                 return false;
         } else {
-                groupString=(*(tempStringList.begin()));
-                splitGroupEntry(groupString);
+                for(QStringList::Iterator it=tempStringList.begin(); it!=tempStringList.end(); it++) {
+                        groupString=*it;
+                                if(!groupString.find(QRegExp("^#"),0)) {// Skip commented lines.
+                                splitGroupEntry(groupString);
+                                return true;
+                        }
+                }
         }
-        return true;
+        return false;
 }
 
 // Find a group by groupname.
 bool Passwd::findGroup(const char *groupname) {
         QRegExp groupRegExp(QString("^%1\\:").arg(groupname));
         return searchGroup(groupRegExp);