diff --git a/src/gui/qt/changecompleteblindsdialog.ui b/src/gui/qt/changecompleteblindsdialog.ui
index 549afc1e..fb1be022 100644
--- a/src/gui/qt/changecompleteblindsdialog.ui
+++ b/src/gui/qt/changecompleteblindsdialog.ui
@@ -242,7 +242,11 @@
             </widget>
            </item>
            <item>
-            <widget class="QSpinBox" name="spinBox_afterThisAlwaysRaiseValue" />
+            <widget class="QSpinBox" name="spinBox_afterThisAlwaysRaiseValue" >
+             <property name="maximum" >
+              <number>9999</number>
+             </property>
+            </widget>
            </item>
            <item>
             <widget class="QLabel" name="label" >
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index fdaf78aa..dd8c7d5a 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -26,6 +26,12 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
 
 	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
 
+	chatInputCompleterNickList = new QStringList;
+	chatInputCompleter = new QCompleter(*chatInputCompleterNickList);
+	chatInputCompleter->setCaseSensitivity(Qt::CaseInsensitive);
+ 	lineEdit_ChatInput->setCompleter(chatInputCompleter);
+
+
 	connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
 	connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) );
 	connect( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
@@ -577,3 +583,15 @@ void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
 		label_gameDesc7->hide();
 	}
 }
+
+void gameLobbyDialogImpl::updateChatInputCompleter() {
+	
+	chatInputCompleterNickList->clear();
+
+	int i;
+	for (i=0; i < treeWidget_NickList->topLevelItemCount(); i++) {
+		chatInputCompleterNickList->append(treeWidget_NickList->itemAt(0,i)->text(0));
+	}
+
+	
+}
\ No newline at end of file
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
index 383fee59..be3ac53e 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
@@ -91,7 +91,7 @@ public slots:
 	void keyPressEvent(QKeyEvent * event); 
 	void hideShowGameDescription(bool show);
 
-	
+	void updateChatInputCompleter();
 
 private:
 	
@@ -105,6 +105,8 @@ private:
 	bool inGame;
 	LobbyChat *myChat;
 	QString myAppDataPath;
+	QStringList *chatInputCompleterNickList;
+	QCompleter *chatInputCompleter;
 
 };
 
diff --git a/src/gui/qt/manualblindsorderdialog.ui b/src/gui/qt/manualblindsorderdialog.ui
index 0589d0d0..4919c1e3 100644
--- a/src/gui/qt/manualblindsorderdialog.ui
+++ b/src/gui/qt/manualblindsorderdialog.ui
@@ -89,7 +89,11 @@
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="spinBox_alwaysRaiseValue" />
+         <widget class="QSpinBox" name="spinBox_alwaysRaiseValue" >
+          <property name="maximum" >
+           <number>9999</number>
+          </property>
+         </widget>
         </item>
         <item>
          <widget class="QLabel" name="label" >