diff --git a/docs/pom.xml b/docs/pom.xml
index 4a12adf6..0dc588cc 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,12 +27,12 @@
 		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
 		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>
 	</properties>
-<!-- 	<dependencies>
+	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
-	</dependencies> -->
+	</dependencies>
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java
index 05588b00..d6cf9c7c 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java
@@ -88,17 +88,10 @@ public class GitCredentialsProviderFactory {
 			aws.setPassword(password);
 			provider = aws;
 		}
-		else if (hasText(username)) {
+		else if (hasText(username) && password != null) {
 			this.logger.debug("Constructing UsernamePasswordCredentialsProvider for URI " + uri);
 			provider = new UsernamePasswordCredentialsProvider(username, password.toCharArray());
 		}
-		else if (hasText(username) && !hasText(passphrase)) {
-			// useful for token based login gh-1602
-			// see
-			// https://stackoverflow.com/questions/28073266/how-to-use-jgit-to-push-changes-to-remote-with-oauth-access-token
-			this.logger.debug("Constructing UsernamePasswordCredentialsProvider for URI " + uri);
-			provider = new UsernamePasswordCredentialsProvider(username, (String) null);
-		}
 		else if (hasText(passphrase)) {
 			this.logger.debug("Constructing PassphraseCredentialsProvider for URI " + uri);
 			provider = new PassphraseCredentialsProvider(passphrase);