diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index 59cbeb217d4572cc785d3797fb6dddcbe4425a46..4984dfd483b151c77afad90745e4c2ab300bdfad 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -373,7 +373,7 @@ class SimpleSAML_Auth_LDAP {
                 // decide whether to base64 encode or not
                 for ($k = 0; $k < $attribute['count']; $k++) {
                     // base64 encode binary attributes
-                    if (strtolower($name) === 'jpegphoto') {
+                    if (strtolower($name) === 'jpegphoto' || strtolower($name) === 'objectguid') {
                         $results[$i][$name][$k] = base64_encode($attribute[$k]);
                     }
                 }
@@ -542,7 +542,7 @@ class SimpleSAML_Auth_LDAP {
 				}
 
 				// Base64 encode jpegPhoto.
-				if (strtolower($name) === 'jpegphoto') {
+				if (strtolower($name) === 'jpegphoto' || strtolower($name) === 'objectguid') {
 					$values[] = base64_encode($value);
 				} else
 					$values[] = $value;