diff --git a/templates/default/en/httpredirect-debug.php b/templates/default/en/httpredirect-debug.php
index a3308cf63556b2b82805f7a05a7078908e98e345..508ad13e1de56ef9bd09bc2330dfccc79e5e68b1 100644
--- a/templates/default/en/httpredirect-debug.php
+++ b/templates/default/en/httpredirect-debug.php
@@ -15,7 +15,10 @@
 		
 		<pre style="overflow: scroll; border: 1px solid #eee"><?php echo $data['message']; ?></pre>
 		
-		<p>[ <a href="<?php echo htmlentities($data['url']); ?>">send SAML message</a> ]</p>
+		<p>[ <a id="sendlink" href="<?php echo htmlentities($data['url']); ?>">send SAML message</a> ]</p>
+		<script type="text/javascript">
+			document.getElementById('sendlink').focus();
+		</script>
 
 		<h2>Debug mode</h2>
 		
diff --git a/templates/default/en/post-debug.php b/templates/default/en/post-debug.php
index 041422474fae5c9decef13fd8802750510d406b2..2228f63d01d9631a4c72a025d5ff92727e418237 100644
--- a/templates/default/en/post-debug.php
+++ b/templates/default/en/post-debug.php
@@ -16,9 +16,13 @@
 		<form method="post" action="<?php echo htmlspecialchars($data['destination']); ?>">
 			<input type="hidden" name="SAMLResponse" value="<?php echo htmlspecialchars($data['response']); ?>" />
 			<input type="hidden" name="<?php echo htmlspecialchars($data['RelayStateName']); ?>" value="<?php echo htmlspecialchars($data['RelayState']); ?>">
-			<input type="submit" value="Submit the response to the service" />
+			<input type="submit" value="Submit the response to the service" id="sendbutton" />
 		</form>
 
+		<script type="text/javascript">
+			document.getElementById('sendbutton').focus();
+		</script>
+
 		<h2>Debug mode</h2>
 		
 		<p>As you are in debug mode you are lucky to see the content of the response you are sending:</p>