diff --git a/classes/login/ShibbolethLogin.php b/classes/login/ShibbolethLogin.php
index faa7c1fb164f3dee711ad48f92f42fc4fd81b718..bea9d4de0a09aafb66f3c974d2f975e679e970b1 100644
--- a/classes/login/ShibbolethLogin.php
+++ b/classes/login/ShibbolethLogin.php
@@ -22,10 +22,10 @@ class ShibbolethLogin extends LoginHandler {
 
             return $this->onIdentityDataReceived($eppn, function($identity) use($eppn) {
                         $identity->email = $_SERVER['mail'];
-                        if (isset($_SERVER['givenName'])) {
+                        if (isset($_SERVER['givenName']) && $_SERVER['givenName'] !== 'N/A') {
                             $identity->name = $_SERVER['givenName'];
                         }
-                        if (isset($_SERVER['sn'])) {
+                        if (isset($_SERVER['sn']) && $_SERVER['sn'] !== 'N/A') {
                             $identity->surname = $_SERVER['sn'];
                         }
                         $identity->eppn = $eppn;