diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl
index d725d61d46..3ceb3767bf 100755
--- a/phpgwapi/templates/idots/login.tpl
+++ b/phpgwapi/templates/idots/login.tpl
@@ -1,18 +1,54 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="eGroupware http://www.phpgroupware.org">
-<META NAME="description" CONTENT="eGroupware login screen">
-<META NAME="keywords" CONTENT="eGroupware login screen">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={charset}">
+<meta name="author" content="eGroupware http://www.eGroupWare.org">
+<meta name="description" content="eGroupWare login screen">
+<meta name="keywords" content="eGroupware login screen">
 <link rel="stylesheet" href="phpgwapi/templates/{template_set}/css/idots.css" type="text/css">	
-<TITLE>{website_title} - Login</TITLE>
-</HEAD>
-<BODY bgcolor="#FFFFFF">
+<link rel="icon" href="phpgwapi/templates/idots/images/favicon.ico" type="image/x-ico">
+<link rel="shortcut icon" href="phpgwapi/templates/idots/images/favicon.ico">
+<title>{website_title} - Login</title>
+<style>
+#containerDiv
+{
+	position:absolute;
+	width:100%;
+	left:0px;
+	top:40%;
+	vertical-align:	bottom;
+}
+
+#centerBox
+{
+	position:relative;
+	width:100%;
+	top:-70px;
+	height:134px;
+	z-index:9;
+}
+</style>
+</head>
+<body bgcolor="#FFFFFF">
 <br>
 <a href="http://{logo_url}"><img src="{logo_file}" alt="{logo_title}" title="{logo_title}" border="0"></a>
-<CENTER>{lang_message}</CENTER>
+<div id="containerDiv">
+<div id="centerBox">
+<center>{lang_message}</center>
 <p>&nbsp;</p>
+<<<<<<< login.tpl
+<table class=sidebox cellSpacing=1 cellPadding=0  border=0  align=center>
+<tr> 
+<td class="sideboxtitle" align="center"  height=28>{website_title}</td>
+</tr>
+<tr> 
+<td class="sideboxcontent" bgColor="#efefef">
+<form method="post" action="{login_url}">
+
+<table class="sideboxtext" cellSpacing=0 cellPadding=0 width="100%" border="0">
+<tr bgcolor="#e6e6e6">
+<td colspan="3" align="center">
+=======
 <FORM name="login_form" method="post" action="{login_url}">
 <TABLE class=sidebox cellSpacing=1 cellPadding=0  border=0  align=center>
 <TR> 
@@ -24,9 +60,25 @@
 <TABLE class="sideboxtext" cellSpacing=0 cellPadding=0 width="100%" border="0">
 <TR bgcolor="#e6e6e6">
 <TD colspan="3" align="center">
+>>>>>>> 1.8
 {cd}
 <br>
 <img width="300" height="1" src="phpgwapi/templates/{template_set}/images/spacer.gif" alt="">
+<<<<<<< login.tpl
+</td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td colspan="3"><input type="hidden" name="passwd_type" value="text">&nbsp;</td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td align="right"><font color="#000000">{lang_username}:&nbsp;</font></td>
+<td align="left"><input name="login" value="{cookie}" style="width: 100px;"></td>
+<td align="left">&nbsp;</td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td align="right"><font color="#000000">{lang_password}:&nbsp;</font></td>
+<td align="left"><input name="passwd" type="password" onChange="this.form.submit()" style="WIDTH: 100px;"></td>
+=======
 </TD>
 </TR>
 <TR bgcolor="#e6e6e6">
@@ -40,7 +92,25 @@
 <TR bgcolor="#e6e6e6">
 <TD align="RIGHT"><font color="#000000">{lang_password}:&nbsp;</font></TD>
 <td align="left"><input name="passwd" type="password" onChange="this.form.submit()" style="WIDTH: 100px; border: 1px solid silver;"></TD>
+>>>>>>> 1.8
 <td>&nbsp;</td>
+<<<<<<< login.tpl
+</tr>
+<tr bgcolor="#e6e6e6">
+<td colspan="3" align="center">
+<input type="submit" value="{lang_login}" name="submitit">
+</td>
+</tr>
+</table>
+</form>
+
+</td>
+</tr>
+</table>
+</div>
+</div>
+
+=======
 </TR>
 <TR bgcolor="#e6e6e6">
 <TD colspan="3" align="CENTER">
@@ -76,11 +146,14 @@
 document.login_form.login.focus();
 //-->
 </script>
+>>>>>>> 1.8
 <div style="bottom:10px;left:10px;position:absolute;visibility:hidden;">
-<img src="phpgwapi/templates/{template_set}/images/valid-html401.png" border="0" alt="Valid HTML 4.01">
-<img src="phpgwapi/templates/{template_set}/images/vcss.png" border="0" alt="Valid CSS">
+	<img src="phpgwapi/templates/{template_set}/images/valid-html401.png" border="0" alt="Valid HTML 4.01">
+	<img src="phpgwapi/templates/{template_set}/images/vcss.png" border="0" alt="Valid CSS">
 </div>
+
 <div style="bottom:10px;right:10px;position:absolute;">
 <a href="http://www.egroupware.org" target="_blank">eGroupWare</a> {version}</div>
+
 </body>
 </html>
diff --git a/phpgwapi/templates/idots/login_selectdomain.tpl b/phpgwapi/templates/idots/login_selectdomain.tpl
index f1c63ab75e..f02a1fa924 100755
--- a/phpgwapi/templates/idots/login_selectdomain.tpl
+++ b/phpgwapi/templates/idots/login_selectdomain.tpl
@@ -1,70 +1,91 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="eGroupware http://www.phpgroupware.org">
-<META NAME="description" CONTENT="eGroupware login screen">
-<META NAME="keywords" CONTENT="eGroupware login screen">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={charset}">
+<meta name="author" content="eGroupware http://www.phpgroupware.org">
+<meta name="description" content="eGroupware login screen">
+<meta name="keywords" content="eGroupware login screen">
 <link rel="stylesheet" href="phpgwapi/templates/{template_set}/css/idots.css" type="text/css">	
-<TITLE>{website_title} - Login</TITLE>
-</HEAD>
-<BODY bgcolor="#FFFFFF">
+<link rel="icon" href="phpgwapi/templates/idots/images/favicon.ico" type="image/x-ico">
+<link rel="shortcut icon" href="phpgwapi/templates/idots/images/favicon.ico">
+<title>{website_title} - Login</title>
+<style>
+#containerDiv
+{
+	position:absolute;
+	width:100%;
+	left:0px;
+	top:40%;
+	vertical-align:	bottom;
+}
+
+#centerBox
+{
+	position:relative;
+	width:100%;
+	top:-70px;
+	height:134px;
+	z-index:9;
+}
+
+</style>
+</head>
+<body bgcolor="#ffffff">
 <br>
 <a href="http://{logo_url}"><img src="{logo_file}" alt="{logo_title}" title="{logo_title}" border="0"></a>
-<CENTER>{lang_message}</CENTER>
+<div id="containerDiv">
+<div id="centerBox">
+<center>{lang_message}</center>
 <p>&nbsp;</p>
-<TABLE class=sidebox cellSpacing=1 cellPadding=0  border=0  align=center>
-<TR> 
-<TD class="sideboxtitle" align="center"  height=28>{website_title}</TD>
-</TR>
-<TR> 
-<TD class="sideboxcontent" bgColor="#efefef">
-<FORM method="post" action="{login_url}">
+<table class=sidebox cellspacing=1 cellpadding=0  border=0  align=center>
+<tr> 
+<td class="sideboxtitle" align="center"  height=28>{website_title}</td>
+</tr>
+<tr> 
+<td class="sideboxcontent" bgcolor="#efefef">
+<form method="post" action="{login_url}">
 
-<TABLE class="sideboxtext" cellSpacing=0 cellPadding=0 width="100%" border="0">
-<TR bgcolor="#e6e6e6">
-<TD colspan="3" align="center">
+<table class="sideboxtext" cellspacing=0 cellpadding=0 width="100%" border="0">
+<tr bgcolor="#e6e6e6">
+<td colspan="3" align="center">
 {cd}
 <br>
 <img width="300" height="1" src="phpgwapi/templates/{template_set}/images/spacer.gif" alt="">
-</TD>
-</TR>
-<TR bgcolor="#e6e6e6">
-<TD colspan="3"> <input type="hidden" name="passwd_type" value="text"> </TD>
-</TR>
-<TR bgcolor="#e6e6e6">
-<td align="right"><font color="#000000">{lang_username}:&nbsp;</font></TD>
-<td align="right"><input name="login" value="{cookie}" style="width: 100px;"></TD>
-<TD align="left"><select name="logindomain">{select_domain}</select></TD>
-</TR>
-<TR bgcolor="#e6e6e6">
-<TD align="RIGHT"><font color="#000000">{lang_password}:&nbsp;</font></TD>
-<td align="right"><input name="passwd" type="password" onChange="this.form.submit()" style="WIDTH: 100px;"></TD>
+</td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td colspan="3"> <input type="hidden" name="passwd_type" value="text"> </td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td align="right"><font color="#000000">{lang_username}:&nbsp;</font></td>
+<td align="right"><input name="login" value="{cookie}" style="width: 100px;"></td>
+<td align="left"><select name="logindomain">{select_domain}</select></td>
+</tr>
+<tr bgcolor="#e6e6e6">
+<td align="right"><font color="#000000">{lang_password}:&nbsp;</font></td>
+<td align="right"><input name="passwd" type="password" onChange="this.form.submit()" style="width: 100px;"></td>
 <td>&nbsp;</td>
-</TR>
-<TR bgcolor="#e6e6e6">
-<TD colspan="3" align="CENTER">
+</tr>
+<tr bgcolor="#e6e6e6">
+<td colspan="3" align="center">
 <input type="submit" value="{lang_login}" name="submitit">
-</TD>
-</TR>
-<!--
-<TR bgcolor="#e6e6e6">
-<TD colspan="3" align="RIGHT">
-<font color="#000000" size="-1">eGroupWare {version}</font>
-</TD>
-</TR>
--->
-</TABLE>
-</FORM>
+</td>
+</tr>
+</table>
+</form>
+
+</td>
+</tr>
+</table>
+</div>
+</div>
 
-</TD>
-</TR>
-</TABLE>
 <div style="bottom:10px;left:10px;position:absolute;visibility:hidden;">
 <img src="phpgwapi/templates/{template_set}/images/valid-html401.png" border="0" alt="Valid HTML 4.01">
 <img src="phpgwapi/templates/{template_set}/images/vcss.png" border="0" alt="Valid CSS">
 </div>
 <div style="bottom:10px;right:10px;position:absolute;">
 <a href="http://www.egroupware.org" target="_blank">eGroupWare</a> {version}</div>
+
 </body>
 </html>
