diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index 065a1cbe0..881854999 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -16,7 +16,6 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	}
 
 	testUsername() {
-		// TODO: find domain matching username
 		Remote.request('AdminDomainMatch',
 			(iError, oData) => {
 				if (oData?.Result?.domain) {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index 98171ac6c..bb17ba8da 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -2,11 +2,7 @@
 	<span data-i18n="TAB_DOMAINS/LEGEND_DOMAINS"></span>
 	<i class="icon-spinner" style="margin: 5px" data-bind="visible: domains.loading"></i>
 </div>
-<a class="btn" data-bind="click: createDomain" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></a>
-&nbsp;&nbsp;
-<a class="btn" data-bind="click: createDomainAlias" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></a>
-<br>
-<br>
+
 <p data-i18n="[html]TAB_DOMAINS/HTML_DOMAINS_HELPER"></p>
 <table class="table table-hover b-admin-domains-list-table" data-bind="i18nUpdate: domains">
 	<colgroup>
@@ -31,8 +27,15 @@
 			<td class="disabled-domain fontastic" data-bind="click: function (oDomain) { $root.disableDomain(oDomain); }, text: disabled() ? '☐' : '☑'"></td>
 		</tr>
 	</tbody>
+	<tfoot>
+		<tr><td colspan="4" style="text-align:right">
+			<a class="btn" data-bind="click: createDomain" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></a>
+			&nbsp;&nbsp;
+			<a class="btn" data-bind="click: createDomainAlias" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></a>
+		</td></tr>
+	</tfoot>
 </table>
-<hr/>
+
 <div>
 	<input data-i18n="[placeholder]GLOBAL/USERNAME" data-bind="textInput: username">
 	<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: testUsername"></button>