diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
index b262fdb..967bfc7 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
@@ -52,7 +52,7 @@ public abstract class RelationalServiceInfo extends UriBasedServiceInfo {
 
 	private String formatQuery() {
 		if (getQuery() != null) {
-			if (getUserName() == null && getPassword() == null) {
+			if (formatUserinfo().isEmpty()) {
 				return String.format("?%s", getQuery());
 			} else {
 				return String.format("&%s", getQuery());