diff --git a/src/main/java/io/lettuce/core/RedisURI.java b/src/main/java/io/lettuce/core/RedisURI.java
index 3716595351..240244e48d 100644
--- a/src/main/java/io/lettuce/core/RedisURI.java
+++ b/src/main/java/io/lettuce/core/RedisURI.java
@@ -118,6 +118,7 @@
  * RedisURI supports Redis Standalone, Redis Sentinel and Redis Cluster with plain, SSL, TLS and unix domain socket connections.
  *
  * @author Mark Paluch
+ * @author Guy Korland
  * @since 3.0
  */
 @SuppressWarnings("serial")
@@ -579,10 +580,10 @@ private static RedisURI buildRedisUriFromUri(URI uri) {
                 }
             }
             if (LettuceStrings.isNotEmpty(password)) {
-                if(username == null) { 
-                  builder.withPassword(password);
+                if (username == null) {
+                    builder.withPassword(password);
                 } else {
-                  builder.withAuthentication(username, password);
+                    builder.withAuthentication(username, password);
                 }
             }
         }
diff --git a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
index a4f1994191..d6695434af 100644
--- a/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
+++ b/src/test/java/io/lettuce/core/RedisURIBuilderUnitTests.java
@@ -31,6 +31,7 @@
  * Unit tests for {@link RedisURI.Builder}.
  *
  * @author Mark Paluch
+ * @author Guy Korland
  */
 class RedisURIBuilderUnitTests {