diff --git a/templates/default/selectidp-dropdown.php b/templates/default/selectidp-dropdown.php
index 930e175fc79318ef46fd9ca862365340a12f9064..46ea384f89c6b36e07bf0783a4f08995df70114f 100644
--- a/templates/default/selectidp-dropdown.php
+++ b/templates/default/selectidp-dropdown.php
@@ -5,6 +5,8 @@ if(!array_key_exists('header', $this->data)) {
 }
 $this->data['header'] = $this->t($this->data['header']);
 
+$this->data['autofocus'] = 'selectbutton';
+
 $this->includeAtTemplateBase('includes/header.php');
 
 foreach ($this->data['idplist'] AS $idpentry) {
@@ -41,7 +43,7 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		}
 		?>
 		</select>
-		<input type="submit" value="<?php echo $this->t('select'); ?>"/>
+		<input id="selectbutton" type="submit" value="<?php echo $this->t('select'); ?>"/>
 		</form>
 
 		
diff --git a/templates/default/selectidp-links.php b/templates/default/selectidp-links.php
index 1cbaa18427542d8ff2b91e9fe47249977284367f..debc78d2fbef443dfa0a99939d47904059e82dde 100644
--- a/templates/default/selectidp-links.php
+++ b/templates/default/selectidp-links.php
@@ -5,6 +5,8 @@ if(!array_key_exists('header', $this->data)) {
 }
 $this->data['header'] = $this->t($this->data['header']);
 
+$this->data['autofocus'] = 'preferredidp';
+
 $this->includeAtTemplateBase('includes/header.php');
 
 foreach ($this->data['idplist'] AS $idpentry) {
@@ -39,7 +41,7 @@ foreach ($this->data['idplist'] AS $idpentry) {
 			echo htmlspecialchars($this->t('idpname_' . $idpentry['entityid'])) . '</h3>';
 
 			echo '	<p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
-			echo '	[ <a href="' . $this->data['urlpattern'] . htmlspecialchars($idpentry['entityid']) . '">Select this IdP</a>]</p>';
+			echo '	[ <a id="preferredidp" href="' . $this->data['urlpattern'] . htmlspecialchars($idpentry['entityid']) . '">Select this IdP</a>]</p>';
 			echo '</div>';
 		}