=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-07 18:30:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-16 16:57:36 +0000
@@ -90,7 +90,7 @@
 
 #submitDiv
 {
-  padding: 5px 0 7px 0;
+  padding: 5px 0 20px 0;
 }
 
 #loginField input[type=text],input[type=password]
@@ -117,7 +117,7 @@
 {
   background-color: #D0E6FD;
   color: #1D5288;
-  margin-top: 30px;
+  margin-top: 15px;
   padding: 15px;
   border-radius: 3px;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-10 15:49:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-16 16:57:36 +0000
@@ -41,11 +41,17 @@
                 </div>
                 <div id="submitDiv">
                 	<input id="submit" class="button" type="submit" value="Login">
-                	#if( $keyAccountRecovery )<a id="forgotPasswordLink" href="recovery.action" style="padding-left: 18px">Forgot password?</a>#end
-                </div>
-                <div style="padding-top: 10px">                	
-                	#if( $keyConfig.selfRegistrationAllowed() )<a id="createAccountLink" href="account.action">Create an account</a>#end
-                </div>
+                </div>
+                #if( $keyAccountRecovery )
+                <div style="padding-bottom: 10px">
+                    <a id="forgotPasswordLink" href="recovery.action">Forgot password?</a>
+                </div>
+                #end
+                #if( $keyConfig.selfRegistrationAllowed() )
+                <div style="padding-bottom: 10px">                	
+                	<a id="createAccountLink" href="account.action">Create an account</a>
+                </div>
+                #end
             </form>
             #if( $failed == true )
             <div id="loginMessage">Wrong username or password</div>