Index: client/Client/Client.vcxproj
===================================================================
--- client/Client/Client.vcxproj	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/Client.vcxproj	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -71,5 +71,4 @@
     <ClCompile Include="..\..\common\Projectile.cpp" />
     <ClCompile Include="..\..\common\WorldMap.cpp" />
-    <ClCompile Include="..\..\common\Message.cpp" />
     <ClCompile Include="..\..\common\Player.cpp" />
     <ClCompile Include="chat.cpp" />
@@ -88,5 +87,4 @@
     <ClInclude Include="..\..\common\Projectile.h" />
     <ClInclude Include="..\..\common\WorldMap.h" />
-    <ClInclude Include="..\..\common\Message.h" />
     <ClInclude Include="..\..\common\Player.h" />
     <ClInclude Include="chat.h" />
Index: client/Client/Client.vcxproj.filters
===================================================================
--- client/Client/Client.vcxproj.filters	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/Client.vcxproj.filters	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -43,7 +43,4 @@
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\common\Message.cpp">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
     <ClCompile Include="Window.cpp">
       <Filter>Source Files\gui</Filter>
@@ -87,7 +84,4 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\Message.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Common.h">
       <Filter>Header Files\common</Filter>
Index: client/Client/RadioButtonList.cpp
===================================================================
--- client/Client/RadioButtonList.cpp	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/RadioButtonList.cpp	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -65,2 +65,6 @@
    return this->selectedButton;
 }
+
+void RadioButtonList::setSelectedButton(int b) {
+   this->selectedButton = b;
+}
Index: client/Client/RadioButtonList.h
===================================================================
--- client/Client/RadioButtonList.h	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/RadioButtonList.h	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -26,4 +26,5 @@
    void addRadioButton(string s);
    int getSelectedButton();
+   void setSelectedButton(int b);
 };
 
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/main.cpp	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -232,5 +232,5 @@
    cout << "Created main screen" << endl;
 
-   wndCurrent = wndLogin;
+   goToLoginScreen();
  
    event_queue = al_create_event_queue();
@@ -398,10 +398,5 @@
          chatConsole.draw(font, al_map_rgb(255,255,255));
 
-         // There should be label gui components that show these or each textbox should have a label
-         if(wndCurrent == wndLogin || wndCurrent == wndRegister) {
-            //al_draw_text(font, al_map_rgb(0, 255, 0), 416, 43, ALLEGRO_ALIGN_LEFT, "Username:");
-            //al_draw_text(font, al_map_rgb(0, 255, 0), 413, 73, ALLEGRO_ALIGN_LEFT, "Password:");
-         }
-         else if(wndCurrent == wndMain) {
+         if(wndCurrent == wndMain) {
             al_draw_text(font, al_map_rgb(0, 255, 0), 4, 43, ALLEGRO_ALIGN_LEFT, "Message:");
 
@@ -645,5 +640,5 @@
                   cout << "Logged out" << endl;
                   state = STATE_START;
-                  wndCurrent = wndLogin;
+                  goToLoginScreen();
                }
 
@@ -914,16 +909,19 @@
 void goToRegisterScreen()
 {
-   wndCurrent = wndRegister;
-
    txtUsernameRegister->clear();
    txtPasswordRegister->clear();
+   lblRegisterStatus->setText("");
+   rblClasses->setSelectedButton(-1);
+
+   wndCurrent = wndRegister;
 }
 
 void goToLoginScreen()
 {
-   wndCurrent = wndLogin;
-
    txtUsername->clear();
    txtPassword->clear();
+   lblLoginStatus->setText("");
+
+   wndCurrent = wndLogin;
 }