Index: kdm/kcm/kdm-users.cpp
===================================================================
--- kdm/kcm/kdm-users.cpp	(revision 1204884)
+++ kdm/kcm/kdm-users.cpp	(working copy)
@@ -103,8 +103,7 @@
     defmaxuid = "65000";
 #endif
 
-    m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir",
-            KStandardDirs::installPath("data") + "kdm/faces") + '/';
+    m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", "/usr/share/faces" ) + '/';
 
     if (!getpwnam("nobody"))
         KMessageBox::sorry(this, i18n(
@@ -317,10 +316,15 @@
 {
     QString user = usercombo->currentText();
     QImage p;
-    if (user != m_defaultText && p.load(m_userPixDir + user + ".face.icon"))
-        rstuserbutton->setEnabled(true);
+
+    if (user != m_defaultText && p.load( m_userPixDir + user + ".png" )) 
+        rstuserbutton->setEnabled( !getuid() );
+    else if (user != m_defaultText && p.load( m_userPixDir + user )) 
+        rstuserbutton->setEnabled( !getuid() );
+    else if (user != m_defaultText && p.load( m_userPixDir + user + ".face.icon" ))
+        rstuserbutton->setEnabled( !getuid() );
     else {
-        p.load(m_userPixDir + ".default.face.icon");
+        p.load( m_userPixDir + "default.png" );
         rstuserbutton->setEnabled(false);
     }
     userbutton->setIcon(QPixmap::fromImage(p.scaled(48, 48, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
@@ -385,7 +389,7 @@
 void KDMUsersWidget::slotUserButtonClicked()
 {
     KIconDialog dlg;
-    dlg.setCustomLocation(KStandardDirs::installPath("data") + "kdm/pics/users");
+    dlg.setCustomLocation( "/usr/share/faces" );
     dlg.setup(KIconLoader::NoGroup, KIconLoader::Any, false, 48, true, true, false);
     QString ic = dlg.openDialog();
     if (ic.isEmpty())
Index: kdm/kfrontend/kgreeter.cpp
===================================================================
--- kdm/kfrontend/kgreeter.cpp	(revision 1204886)
+++ kdm/kfrontend/kgreeter.cpp	(working copy)
@@ -321,12 +321,12 @@
             fn += '/';
             fn += ps->pw_name;
         }
-        fn += ".face.icon";
+        QFile(fn + ".png").exists() ?  fn += ".png" : fn += ".face.icon";
         if (loadFace(fn, p, pp))
             goto gotit;
     } while (--nd >= 0);
     p = default_pix;
-  gotit:
+gotit:
     QString realname = KStringHandler::from8Bit(ps->pw_gecos);
     realname.truncate(realname.indexOf(',') & (~0U >> 1));
     if (realname.isEmpty() || realname == username) {
@@ -383,12 +383,19 @@
 
     QImage default_pix;
     if (userView) {
-        QByteArray fn = QFile::encodeName(_faceDir) + "/.default.face.icon";
-        if (!loadFace(fn, default_pix, QByteArray(), true)) {
-            default_pix = QImage(48, 48, QImage::Format_ARGB32);
-            default_pix.fill(0);
-        }
+       QByteArray fn = QFile::encodeName( _faceDir + "/default.png" );
+       if (!loadFace( fn, default_pix , QByteArray(), true)) 
+        {
+           fn = QFile::encodeName( _faceDir + "/.default.face.icon" );
+           if (!loadFace( fn, default_pix , QByteArray(), true))
+            {
+               logError( "Cannot open default user face\n" );
+               default_pix = QImage( 48, 48, QImage::Format_ARGB32 );
+               default_pix.fill( 0 );
+           }
+       }
     }
+
     if (_showUsers == SHOW_ALL) {
         UserList noUsers(_noUsers);
         QSet<QString> dupes;