diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index c329415aa838b4f96ac6cc50b48a6c4f490f8f16..912d52be32f2be10f608146e0096671ff3a6f6a6 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -324,19 +324,6 @@ class SimpleSAML_Session {
 		$this->nameid = $nameid;
 	}
 	public function getNameID() {
-		if (array_key_exists('value', $this->nameid)) {
-			/*
-			 * This session was saved by an old version of simpleSAMLphp.
-			 * Convert to the new NameId format.
-			 *
-			 * TODO: Remove this conversion once every session uses the new format.
-			 */
-			$this->nameid['Value'] = $this->nameid['value'];
-			unset($this->nameid['value']);
-
-			$this->dirty = TRUE;
-		}
-
 		return $this->nameid;
 	}
 
diff --git a/www/wsfed/sp/prp.php b/www/wsfed/sp/prp.php
index 8efd76edbfe3723d9c97491f8b6306eb4312a18a..3100fd2908b82012be068af5edb850a8ca5332b1 100644
--- a/www/wsfed/sp/prp.php
+++ b/www/wsfed/sp/prp.php
@@ -116,7 +116,7 @@ try {
 	}
 	$nameid = array(
 		'Format' => $nameid->item(0)->getAttribute('Format'),
-		'value' => $nameid->item(0)->textContent,
+		'Value' => $nameid->item(0)->textContent,
 		);