diff --git a/pom.xml b/pom.xml
index 3480d85..e75efa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,255 +1,255 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
         <version>1.586</version>
     </parent>
 
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>phab-oauth</artifactId>
-    <version>0.35</version>
+    <version>0.37</version>
     <name>Phabricator Authentication Plugin</name>
     <description>TODO</description>
     <packaging>hpi</packaging>
 
     <url></url>
 
     <licenses>
         <license>
             <name>MIT license</name>
             <comments>All source code is under the MIT license.</comments>
         </license>
     </licenses>
 
     <developers>
         <developer>
             <id>rorist</id>
             <name>Jean-Baptiste Aubort</name>
             <email>jean-baptiste.aubort@epfl.ch</email>
             <url>https://github.com/rorist</url>
             <roles>
                 <role>maintainer</role>
             </roles>
             <timezone>Europe/Zurich</timezone>
         </developer>
     </developers>
 
     <scm>
         <connection>scm:git:ssh://github.com/rorist/phab-oauth-plugin.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/rorist/phab-oauth-plugin.git</developerConnection>
         <url>https://github.com/rorist/phab-oauth-plugin</url>
       <tag>HEAD</tag>
   </scm>
 
   <!-- Use repositories suggested in plugin tutorial: https://wiki.jenkins-ci.org/display/JENKINS/Plugin+tutorial -->
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
       <url>http://repo.jenkins-ci.org/public/</url>
     </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
       <id>repo.jenkins-ci.org</id>
       <url>http://repo.jenkins-ci.org/public/</url>
     </pluginRepository>
   </pluginRepositories>
 
   <dependencies>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>mailer</artifactId>
       <version>1.4</version>
     </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>20090211</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>git</artifactId>
             <version>2.0.3</version>
             <type>jar</type>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
                     <debug>true</debug>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
                 <version>1.109</version>
                 <extensions>true</extensions>
                 <configuration>
                     <compatibleSinceVersion>1.93</compatibleSinceVersion>
                 </configuration>
             </plugin>
         </plugins>
 
         <pluginManagement>
             <plugins>
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
                     <artifactId>lifecycle-mapping</artifactId>
                     <version>1.0.0</version>
                     <configuration>
                         <lifecycleMappingMetadata>
                             <pluginExecutions>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>org.kohsuke</groupId>
                                         <artifactId>
                                             access-modifier-checker
                                         </artifactId>
                                         <versionRange>
                                             [1.0,)
                                         </versionRange>
                                         <goals>
                                             <goal>enforce</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>com.cloudbees</groupId>
                                         <artifactId>
                                             maven-license-plugin
                                         </artifactId>
                                         <versionRange>
                                             [1.4,)
                                         </versionRange>
                                         <goals>
                                             <goal>process</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
                                             org.jvnet.hudson.tools
                                         </groupId>
                                         <artifactId>
                                             maven-hpi-plugin
                                         </artifactId>
                                         <versionRange>
                                             [2.1.1,)
                                         </versionRange>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
                                             org.apache.maven.plugins
                                         </groupId>
                                         <artifactId>
                                             maven-enforcer-plugin
                                         </artifactId>
                                         <versionRange>
                                             [1.0,)
                                         </versionRange>
                                         <goals>
                                             <goal>display-info</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
                                             org.codehaus.gmaven
                                         </groupId>
                                         <artifactId>
                                             gmaven-plugin
                                         </artifactId>
                                         <versionRange>
                                             [1.3,)
                                         </versionRange>
                                         <goals>
                                         	<goal>
                                         		generateTestStubs
                                         	</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
                                             org.jvnet.localizer
                                         </groupId>
                                         <artifactId>
                                             maven-localizer-plugin
                                         </artifactId>
                                         <versionRange>
                                             [1.12,)
                                         </versionRange>
                                         <goals>
                                             <goal>generate</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
                                             org.jenkins-ci.tools
                                         </groupId>
                                         <artifactId>
                                             maven-hpi-plugin
                                         </artifactId>
                                         <versionRange>
                                             [1.74,)
                                         </versionRange>
                                     </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
     </build>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 </project>
diff --git a/src/main/java/org/jenkinsci/plugins/PhabricatorOAuthUserDetails.java b/src/main/java/org/jenkinsci/plugins/PhabricatorOAuthUserDetails.java
index 27717d9..6808b1e 100644
--- a/src/main/java/org/jenkinsci/plugins/PhabricatorOAuthUserDetails.java
+++ b/src/main/java/org/jenkinsci/plugins/PhabricatorOAuthUserDetails.java
@@ -1,39 +1,39 @@
 /**
  The MIT License
 
 Copyright (c) 2016 Jean-Baptiste Aubort
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
  */
 package org.jenkinsci.plugins;
 
 import org.acegisecurity.userdetails.User;
 import org.acegisecurity.userdetails.UserDetails;
 import org.acegisecurity.GrantedAuthority;
 
 public class PhabricatorOAuthUserDetails extends User implements UserDetails {
 
 	private static final long serialVersionUID = 1L;
 
 	public PhabricatorOAuthUserDetails(String user,
 			GrantedAuthority[] authorities) {
-		super(user, "", true, true, true, true, authorities);
+		super(user, "nopassword", true, true, true, true, authorities);
 	}
 
 }
diff --git a/src/main/java/org/jenkinsci/plugins/PhabricatorSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/PhabricatorSecurityRealm.java
index 4338c57..1123e3f 100644
--- a/src/main/java/org/jenkinsci/plugins/PhabricatorSecurityRealm.java
+++ b/src/main/java/org/jenkinsci/plugins/PhabricatorSecurityRealm.java
@@ -1,275 +1,279 @@
 /**
  The MIT License
 
 Copyright (c) 2011 Michael O'Cleirigh
 Copyright (c) 2016 Jean-Baptiste Aubort
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
  */
 package org.jenkinsci.plugins;
 
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.Descriptor;
 import hudson.model.User;
 import hudson.security.SecurityRealm;
 import hudson.tasks.Mailer;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import jenkins.model.Jenkins;
 
 import org.acegisecurity.Authentication;
 import org.acegisecurity.AuthenticationException;
 import org.acegisecurity.AuthenticationManager;
 import org.acegisecurity.BadCredentialsException;
 import org.acegisecurity.GrantedAuthority;
 import org.acegisecurity.context.SecurityContextHolder;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import org.acegisecurity.userdetails.UserDetails;
 import org.acegisecurity.userdetails.UserDetailsService;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.jfree.util.Log;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.Header;
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
 import org.springframework.dao.DataAccessException;
 
 public class PhabricatorSecurityRealm extends SecurityRealm {
 
 	private static final String OAUTH_SCOPES = "";
 	private static final String PHAB_OAUTH = "oauthserver";
 	protected static final String PHAB_API = "api/user.whoami";
 	private static final String REFERER_ATTRIBUTE = PhabricatorSecurityRealm.class
 			.getName() + ".referer";
 	private static final Logger LOGGER = Logger
 			.getLogger(PhabricatorSecurityRealm.class.getName());
 
 	private String clientID;
 	private String clientSecret;
 	private String serverURL;
 
 	// private boolean trustAllCert;
 
 	@DataBoundConstructor
 	public PhabricatorSecurityRealm(String serverURL, String clientID,
 			String clientSecret, boolean trustAllCert) {
 		super();
 		this.serverURL = Util.fixEmptyAndTrim(serverURL);
 		this.clientID = Util.fixEmptyAndTrim(clientID);
 		this.clientSecret = Util.fixEmptyAndTrim(clientSecret);
 		// this.trustAllCert = trustAllCert;
 	}
 
 	public PhabricatorSecurityRealm() {
 		super();
 		LOGGER.log(Level.FINE, "PhabricatorSecurityRealm()");
 	}
 
 	public String getClientID() {
 		return clientID;
 	}
 
 	public void setClientID(String clientID) {
 		this.clientID = clientID;
 	}
 
 	public String getClientSecret() {
 		return clientSecret;
 	}
 
 	public void setClientSecret(String clientSecret) {
 		this.clientSecret = clientSecret;
 	}
 
 	public String getServerURL() {
 		return serverURL;
 	}
 
 	public void setServerURL(String serverURL) {
 		this.serverURL = serverURL;
 	}
 
 	@Override
 	public String getLoginUrl() {
 		return "securityRealm/commenceLogin";
 	}
 
 	public HttpResponse doCommenceLogin(StaplerRequest request,
 			@Header("Referer") final String referer) throws IOException {
 		LOGGER.log(Level.WARNING, "doCommenceLogin");
 		request.getSession().setAttribute(REFERER_ATTRIBUTE, referer);
 		return new HttpRedirect(serverURL + PHAB_OAUTH + "/auth/?client_id="
 				+ clientID + "&response_type=code&scope=" + OAUTH_SCOPES);
 	}
 
 	public HttpResponse doFinishLogin(StaplerRequest request)
 			throws IOException {
 		String code = request.getParameter("code");
 
 		if (code == null || code.trim().length() == 0) {
 			Log.info("doFinishLogin: missing code.");
 			return HttpResponses.redirectToContextRoot();
 		}
 
 		String rootUrl = Jenkins.getInstance().getRootUrl()
 				+ "securityRealm/finishLogin";
 
 		String authUrl = serverURL + PHAB_OAUTH + "/token/?client_id="
 				+ clientID + "&client_secret=" + clientSecret + "&code=" + code
 				+ "&grant_type=authorization_code&redirect_uri=" + rootUrl;
 
 		String content = getUrlContent(authUrl);
 		String accessToken;
 		try {
 			JSONObject jsonObject = new JSONObject(content);
 			accessToken = jsonObject.getString("access_token");
 			LOGGER.log(Level.WARNING, "accessToken FOUND=" + accessToken);
 		} catch (JSONException e) {
 			LOGGER.log(Level.WARNING, "accessToken not found=" + e.getMessage());
 			accessToken = null;
 		}
 
 		if (accessToken != null && accessToken.trim().length() > 0) {
 			PhabricatorAuthenticationToken auth = new PhabricatorAuthenticationToken(
 					accessToken);
 			SecurityContextHolder.getContext().setAuthentication(auth);
 			PhabricatorUser user = auth.getUser();
 			User u = User.current();
 			u.setFullName(user.getRealname());
 			u.addProperty(new Mailer.UserProperty(user.getEmail()));
 			// TODO: What is it for the u object ?
 		} else {
 			Log.info("Phabricator did not return an access token.");
 		}
 
 		String referer = (String) request.getSession().getAttribute(
 				REFERER_ATTRIBUTE);
 		if (referer != null)
 			return HttpResponses.redirectTo(referer);
 
 		return HttpResponses.redirectToContextRoot();
 	}
 
 	protected String getUrlContent(String url) throws IOException {
 		/*
 		 * FIXME if (trustAllCert) { LOGGER.log(Level.WARNING,
 		 * "Trust all certificates"); Protocol easyhttps = new Protocol("https",
 		 * new EasySSLProtocolSocketFactory(), 443);
 		 * Protocol.registerProtocol("https", easyhttps); }
 		 */
 		HttpGet httpGet = new HttpGet(url);
 		DefaultHttpClient httpclient = new DefaultHttpClient();
 		org.apache.http.HttpResponse response = httpclient.execute(httpGet);
 		HttpEntity entity = response.getEntity();
 		String content = EntityUtils.toString(entity);
 		httpclient.getConnectionManager().shutdown();
 		return content;
 	}
 
 	@Override
 	public boolean allowsSignup() {
 		return false;
 	}
 
 	@Override
 	public SecurityComponents createSecurityComponents() {
 		return new SecurityComponents(new AuthenticationManager() {
 
 			public Authentication authenticate(Authentication authentication)
 					throws AuthenticationException {
 				if (authentication instanceof PhabricatorAuthenticationToken)
 					return authentication;
 				if (authentication instanceof UsernamePasswordAuthenticationToken)
 					try {
 						UsernamePasswordAuthenticationToken token = (UsernamePasswordAuthenticationToken) authentication;
 						PhabricatorAuthenticationToken auth = new PhabricatorAuthenticationToken(
 								token.getCredentials().toString());
 						SecurityContextHolder.getContext().setAuthentication(
 								auth);
 						return auth;
 					} catch (IOException e) {
 						throw new RuntimeException(e);
 					}
 				throw new BadCredentialsException(
 						"Unexpected authentication type: " + authentication);
 			}
 		}, new UserDetailsService() {
 			public UserDetails loadUserByUsername(String username)
 					throws UsernameNotFoundException, DataAccessException {
 				return PhabricatorSecurityRealm.this
 						.loadUserByUsername(username);
 			}
 		});
 	}
 
 	@Override
 	public UserDetails loadUserByUsername(String username) {
 		PhabricatorAuthenticationToken authToken = (PhabricatorAuthenticationToken) SecurityContextHolder
 				.getContext().getAuthentication();
 		if (authToken == null) {
 			throw new UsernameNotFoundException("Could not get auth token.");
 		}
 
+		if (username == null) {
+			throw new UsernameNotFoundException("Could not get username.");
+		}
+
 		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
 		authorities.add(SecurityRealm.AUTHENTICATED_AUTHORITY);
 
 		PhabricatorOAuthUserDetails userDetails = new PhabricatorOAuthUserDetails(
 				username, authorities.toArray(new GrantedAuthority[authorities
 						.size()]));
 
 		return userDetails;
 	}
 
 	@Extension
 	public static final class DescriptorImpl extends Descriptor<SecurityRealm> {
 
 		@Override
 		public String getHelpFile() {
 			return "/plugin/phab-oauth/help/help-security-realm.html";
 		}
 
 		@Override
 		public String getDisplayName() {
 			return "Phabricator OAuth Plugin";
 		}
 
 		public DescriptorImpl() {
 			super();
 		}
 
 		public DescriptorImpl(Class<? extends SecurityRealm> clazz) {
 			super(clazz);
 		}
 	}
 
 }