diff --git a/phpgwapi/templates/default/css/submarine.css b/phpgwapi/templates/default/css/submarine.css
index 7e0840acbc..fb64932446 100644
--- a/phpgwapi/templates/default/css/submarine.css
+++ b/phpgwapi/templates/default/css/submarine.css
@@ -51,6 +51,13 @@ a:hover
 	width: 100%;
 }
 
+table.login
+{
+	margin-top: 150px;
+	width: 40%;
+	text-align: center;
+}
+
 .login
 {
 	background-color: #80BBFF;
diff --git a/phpgwapi/templates/default/login.xsl b/phpgwapi/templates/default/login.xsl
index f2950c69ca..7a12245114 100644
--- a/phpgwapi/templates/default/login.xsl
+++ b/phpgwapi/templates/default/login.xsl
@@ -24,98 +24,78 @@
 
 	<xsl:template match="login_standard">
 	<xsl:variable name="login_layout"><xsl:value-of select="login_layout"/></xsl:variable>
-		<table cellpadding="0" cellspacing="0" width="100%" height="100%">
-			<tr>
-				<td>
-					<a href="http://www.phpgroupware.org" target="_blank" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-							<xsl:value-of select="lang_phpgw_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-						<img src="phpgwapi/templates/{$login_layout}/images/logo.png" alt="phpGroupWare" border="0"/>
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td align="center"><xsl:value-of select="phpgw_loginscreen_message"/></td>
-			</tr>
-			<tr>
-				<td valign="middle" align="center">
-					<table cellpadding="0" cellspacing="0" width="40%" class="login">
-					<xsl:choose>
-					<xsl:when test="loginscreen">
-					<xsl:variable name="login_url"><xsl:value-of select="login_url"/></xsl:variable>
-					<xsl:variable name="cookie"><xsl:value-of select="cookie"/></xsl:variable>
-					<xsl:variable name="lang_login"><xsl:value-of select="lang_login"/></xsl:variable>
-						<tr>
-							<td>
-								<table width="100%" cellpadding="2" cellspacing="1" class="login">
-									<tr>
-										<td align="center"><b><xsl:value-of select="website_title"/></b></td>
-									</tr>
-									<tr class="row_off">
-										<td>
-											<form name="login" method="post" action="{$login_url}">
-											<input type="hidden" name="passwd_type" value="text"/>
-											<table align="center" width="100%" cellpadding="2" cellspacing="2">
-												<tr>
-													<td colspan="3" align="center"><xsl:value-of disable-output-escaping="yes" select="msgbox"/></td>
-												</tr>
-												<tr>
-													<td width="33%" align="right"><xsl:value-of select="lang_username"/></td>
-													<td width="33%" align="center"><input name="login" value="{$cookie}"/></td>
-													<xsl:choose>
-														<xsl:when test="domain_select">
-															<td><select name="logindomain"><xsl:apply-templates select="domain_select"/></select></td>
-														</xsl:when>
-														<xsl:otherwise>
-															<td></td>
-														</xsl:otherwise>
-													</xsl:choose>
-												</tr>
-												<tr>
-													<td align="right"><xsl:value-of select="lang_password"/></td>
-													<td align="center"><input name="passwd" type="password" onChange="this.form.submit()"/></td>
-													<td></td>
-												</tr>
-												<tr>
-													<td colspan="3" align="center">
-														<input type="submit" value="{$lang_login}" name="submitit"/>
-													</td>
-												</tr>
-											</table>
-											</form>
-										</td>
-									</tr>
-									<tr>
-										<td align="center">
-											<xsl:value-of select="lang_powered_by"/>
-											<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
-												<xsl:attribute name="onMouseover">
-													<xsl:text>window.status='</xsl:text>
-													<xsl:value-of select="lang_phpgw_statustext"/>
-													<xsl:text>'; return true;</xsl:text>
-												</xsl:attribute>
-												<xsl:text> phpGroupWare </xsl:text>
-											</a>
-											<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
+	<xsl:variable name="login_url"><xsl:value-of select="login_url"/></xsl:variable>
+		<p>
+			<a href="http://www.phpgroupware.org" target="_blank" onMouseout="window.status='';return true;">
+				<xsl:attribute name="onMouseover">
+					<xsl:text>window.status='</xsl:text>
+					<xsl:value-of select="lang_phpgw_statustext"/>
+					<xsl:text>'; return true;</xsl:text>
+				</xsl:attribute>
+				<img src="phpgwapi/templates/{$login_layout}/images/logo.png" alt="phpGroupWare" border="0"/>
+			</a>
+		</p>
+		<p>
+			<xsl:value-of select="phpgw_loginscreen_message"/>
+		</p>
+		<table cellpadding="2" cellspacing="0" align="center" class="login">
+			<xsl:choose>
+				<xsl:when test="loginscreen">
+				<form name="login" method="post" action="{$login_url}">
+				<input type="hidden" name="passwd_type" value="text"/>
+				<xsl:variable name="cookie"><xsl:value-of select="cookie"/></xsl:variable>
+				<xsl:variable name="lang_login"><xsl:value-of select="lang_login"/></xsl:variable>
+				<tr>
+					<td colspan="3" align="center"><b><xsl:value-of select="website_title"/></b></td>
+				</tr>
+				<tr class="row_off">
+					<td colspan="3" align="center"><xsl:value-of disable-output-escaping="yes" select="msgbox"/></td>
+				</tr>
+				<tr class="row_off">
+					<td width="33%" align="right"><xsl:value-of select="lang_username"/></td>
+					<td width="33%" align="center"><input name="login" value="{$cookie}"/></td>
+						<xsl:choose>
+							<xsl:when test="domain_select">
+								<td><select name="logindomain"><xsl:apply-templates select="domain_select"/></select></td>
+							</xsl:when>
+							<xsl:otherwise>
+								<td></td>
+							</xsl:otherwise>
+						</xsl:choose>
+					</tr>
+					<tr class="row_off">
+						<td align="right"><xsl:value-of select="lang_password"/></td>
+						<td align="center"><input name="passwd" type="password" onChange="this.form.submit()"/></td>
+						<td></td>
+					</tr>
+					<tr class="row_off">
+						<td colspan="3" align="center">
+							<input type="submit" value="{$lang_login}" name="submitit"/>
+						</td>
+					</tr>
+					<tr>
+						<td colspan="3" align="center">
+							<xsl:value-of select="lang_powered_by"/>
+							<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
+								<xsl:attribute name="onMouseover">
+									<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_phpgw_statustext"/>
+									<xsl:text>'; return true;</xsl:text>
+								</xsl:attribute>
+								<xsl:text> phpGroupWare </xsl:text>
+							</a>
+							<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
+						</td>
+					</tr>
+					</form>
 					</xsl:when>
 					<xsl:otherwise>
-						<tr>
-							<td align="center">Opps! You caught us in the middle of a system upgrade.<br/>Please, check back with us shortly.</td>
-						</tr>
+					<tr>
+						<td align="center">Opps! You caught us in the middle of a system upgrade.<br/>Please, check back with us shortly.</td>
+					</tr>
 					</xsl:otherwise>
-					</xsl:choose>
-					</table>
-				</td>
-			</tr>
-		</table>
+				</xsl:choose>
+			</table>
 	</xsl:template>
 
 	<xsl:template match="domain_select">