diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 4f51a6f..d7b84d0 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -182,6 +182,7 @@ const UserList = GObject.registerClass({
 
         this.child = this._box;
         this._items = {};
+        this._numUserAdded = 0;
     }
 
     vfunc_key_focus_in() {
@@ -280,6 +281,7 @@ const UserList = GObject.registerClass({
         this._box.add_child(item);
 
         this._items[userName] = item;
+        this._numUserAdded += 1;
 
         item.connect('activate', this._onItemActivated.bind(this));
 
@@ -289,6 +291,8 @@ const UserList = GObject.registerClass({
         this._moveFocusToItems();
 
         this.emit('item-added', item);
+        if(this._numUserAdded == 1)
+            this.emit('activate', item);
     }
 
     removeUser(user) {