diff --git a/lng/english.lng.php b/lng/english.lng.php
index e440904d..f24d5d9e 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1252,5 +1252,6 @@ $lng['spf']['use_spf'] = 'Activate SPF for domains?';
 $lng['spf']['spf_entry'] = 'SPF entry for all domains';
 $lng['panel']['dirsmissing'] = 'The given directory could not be found.';
 $lng['panel']['toomanydirs'] = 'Too many subdirectories. Falling back to manual path-select.';
+$lng['panel']['abort'] = 'Abort';
 
 ?>
diff --git a/lng/german.lng.php b/lng/german.lng.php
index ef7a6a42..377d8444 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1232,5 +1232,6 @@ $lng['spf']['use_spf'] = 'Aktiviere SPF für Domains?';
 $lng['spf']['spf_entry'] = 'SPF Eintrag für alle Domains';
 $lng['panel']['dirsmissing'] = 'Das angegebene Verzeichnis konnte nicht gefunden werden.';
 $lng['panel']['toomanydirs'] = 'Zu viele Unterverzeichnisse. Weiche auf manuelle Verzeichniseingabe aus.';
+$lng['panel']['abort'] = 'Abbrechen';
 
 ?>
diff --git a/templates/customer/email/forwarder_add.tpl b/templates/customer/email/forwarder_add.tpl
index a051b837..e02f3f75 100644
--- a/templates/customer/email/forwarder_add.tpl
+++ b/templates/customer/email/forwarder_add.tpl
@@ -14,13 +14,16 @@ $header
 			</tr>
 			<tr>
 				<td class="main_field_name">{$lng['emails']['to']}:</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="destination" size="30" /></td>
+				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" id="destination" name="destination" size="30" /></td>
 			</tr>
 			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['forwarder_add']}" /></td>
+				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['forwarder_add']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['abort']}" onclick="history.back();" /></td>
 			</tr>
 		</table>
 	</form>
 	<br />
 	<br />
-$footer
\ No newline at end of file
+	<script type="text/javascript">
+		document.forms[0].elements.destination.focus();
+	</script>
+$footer