diff --git a/modules/saml_sp_drupal_login/saml_sp_drupal_login.module b/modules/saml_sp_drupal_login/saml_sp_drupal_login.module
index 4a80402..1f89bed 100644
--- a/modules/saml_sp_drupal_login/saml_sp_drupal_login.module
+++ b/modules/saml_sp_drupal_login/saml_sp_drupal_login.module
@@ -194,7 +194,7 @@ function saml_sp_drupal_login__saml_authenticate($is_valid, saml_sp_Response $sa
       $account = user_save($account, $new_user);
       // Store the NameID value from IdP to for the user
       $wrapper = entity_metadata_wrapper('user', $account);
-      $wrapper->field_nameid->set($name_id);
+      $wrapper->{$idp->nameid_field}->set($name_id);
       $wrapper->save();
       watchdog('saml_sp', 'New SSO user account for %mail with UID %uid' , array('%mail' => $email, '%uid' => $account->uid));
     }