diff --git a/api/src/Auth/Saml.php b/api/src/Auth/Saml.php
index b407efd6c7..f4774296bd 100644
--- a/api/src/Auth/Saml.php
+++ b/api/src/Auth/Saml.php
@@ -100,6 +100,7 @@ class Saml implements BackendSSO
 	 * Some urn:oid constants for common attributes
 	 */
 	const eduPersonPricipalName = 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6';
+	const eduPersonUniqueId = 'urn:oid:1.3.6.1.4.1.5923.1.1.1.13';
 	const emailAddress = 'urn:oid:0.9.2342.19200300.100.1.3';
 	const firstName = 'urn:oid:2.5.4.42';
 	const lastName = 'urn:oid:2.5.4.4';
@@ -526,6 +527,8 @@ class Saml implements BackendSSO
 		{
 			case 'eduPersonPrincipalName':
 				return self::eduPersonPricipalName;
+			case 'eduPersonUniqueId':
+				return self::eduPersonUniqueId;
 			case 'emailAddress':
 				return self::emailAddress;
 			case 'customOid':
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index abf75acc50..3e4293b11f 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -522,8 +522,9 @@
     <td>
      <select name="newsettings[saml_username]">
       <option value="eduPersonPrincipalName"{selected_saml_username_eduPersonPrincipalName}>eduPersonPrincipalName</option>
+      <option value="eduPersonUniqueId"{selected_saml_username_eduPersonUniqueId}>eduPersonUniqueId</option>
       <option value="emailAddress"{selected_saml_username_emailAddress}>emailAddress</option>
-      <option value="custom"{selected_saml_username_customOid}>{lang_custom_OID}</option>
+      <option value="customOid"{selected_saml_username_customOid}>{lang_custom_OID}</option>
      </select>
      <input name="newsettings[saml_username_oid]" value="{value_saml_username_oid}" placeholder="urn:oid:x.x.x.x" size="40" />
     </td>