diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java
index e836d8dc00..8a7089a487 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java
@@ -44,7 +44,7 @@ class DataSourceInitializationConfiguration {
 
 	private static DataSource determineDataSource(DataSource dataSource, String username, String password) {
 		if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
-			DataSourceBuilder.derivedFrom(dataSource).username(username).password(password)
+			return DataSourceBuilder.derivedFrom(dataSource).username(username).password(password)
 					.type(SimpleDriverDataSource.class).build();
 		}
 		return dataSource;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java
index e6aee342ed..8bf8621337 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java
@@ -50,7 +50,7 @@ class R2dbcInitializationConfiguration {
 	private static ConnectionFactory determineConnectionFactory(ConnectionFactory connectionFactory, String username,
 			String password) {
 		if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
-			ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build();
+			return ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build();
 		}
 		return connectionFactory;
 	}