diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl
index 1811eb569f..07ced07a06 100644
--- a/admin/templates/default/account_form.tpl
+++ b/admin/templates/default/account_form.tpl
@@ -61,3 +61,13 @@
      <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
     </tr>
 <!-- END form_buttons_ -->
+
+<!-- BEGIN form_logininfo -->
+    <tr bgcolor="{tr_color1}">
+     <td>{lang_lastlogin}</td>
+     <td>{account_lastlogin}</td>
+
+     <td>{lang_lastloginfrom}</td>
+     <td>{account_lastloginfrom}</td>
+    </tr>
+<!-- END form_logininfo -->
diff --git a/admin/viewaccount.php b/admin/viewaccount.php
index a949a72a8d..25988fd973 100755
--- a/admin/viewaccount.php
+++ b/admin/viewaccount.php
@@ -31,12 +31,11 @@
 		Header('Location: ' . $phpgw->link('/admin/accounts.php'));
 	}
 
-	$t = new Template($phpgw->common->get_tpl_dir('admin'));
+	$t = new Template(PHPGW_APP_TPL);
 	$t->set_unknowns('remove');
-	$t->set_file(array(
-		'form'           => 'account_form.tpl',
-		'form_logininfo' => 'account_form_logininfo.tpl'
-	));
+	$t->set_file(array('account' => 'account_form.tpl'));
+	$t->set_block('account','form','form');
+	$t->set_block('account','form_logininfo','form_logininfo');
 
 	$t->set_var('th_bg',$phpgw_info['theme']['th_bg']);
 	$t->set_var('tr_color1',$phpgw_info['theme']['row_on']);
@@ -190,4 +189,4 @@
 
 	$t->pfp('out','form');
 	$phpgw->common->phpgw_footer();
-?>
\ No newline at end of file
+?>