diff --git a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp
index 54c7de04..5e83acae 100644
--- a/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp
+++ b/src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp
@@ -28,16 +28,7 @@ bool MyNickListSortFilterProxyModel::filterAcceptsRow(int sourceRow, const QMode
 
     }
 
-//	QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
-//	QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
-//	QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
-//	QModelIndex index3 = sourceModel()->index(sourceRow, 3, sourceParent);
-//        QModelIndex index4 = sourceModel()->index(sourceRow, 4, sourceParent);
-//
-//	return ((sourceModel()->data(index1, 16).toString().contains(column1RegExp)
-//			&& sourceModel()->data(index2, 16).toString().contains(column2RegExp)
-//                        && sourceModel()->data(index3, 16).toString().contains(column3RegExp)
-//                        && sourceModel()->data(index4, 16).toString().contains(column4RegExp)) || sourceModel()->data(index0, 16) == "MeInThisGame");
+    return false;
 }
 
 bool MyNickListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
@@ -59,6 +50,8 @@ bool MyNickListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMo
         }
         break;
     }
+
+    return false;
 }
 
 void MyNickListSortFilterProxyModel::setFilterState(int state)
diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
index dd441df3..5fcc2a95 100644
--- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
+++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
@@ -16,6 +16,19 @@ internetGameLoginDialogImpl::internetGameLoginDialogImpl(QWidget *parent, Config
 void internetGameLoginDialogImpl::regUserToggled(bool b) {
 	
 	checkBox_guest->setChecked(!b);
+
+        if(b) {
+            lineEdit_username->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()));
+            if(myConfig->readConfigInt("InternetSavePassword")) {
+                    checkBox_rememberPassword->setChecked(true);
+                    lineEdit_password->setText(QString::fromUtf8(QByteArray::fromBase64(myConfig->readConfigString("InternetLoginPassword").c_str())));
+            }
+            else {
+                    checkBox_rememberPassword->setChecked(false);
+                    lineEdit_password->clear();
+            }
+        }
+
         okButtonCheck();
 }