diff --git a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
index 2750e7aa9..bb7f46386 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
@@ -155,12 +155,6 @@
 
 	<!-- JPA -->
 
-	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
-		<!-- <property name="databasePlatform" value="org.eclipse.persistence.platform.database.MySQLPlatform" /> -->
-		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.HSQLPlatform"></property>
-		<property name="showSql" value="true" />
-	</bean>
-
 	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 		<property name="entityManagerFactory" ref="entityManagerFactory" />
 	</bean>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
index 9cefc62bf..cc5c8555c 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
@@ -25,6 +25,11 @@
 		<jdbc:script location="classpath:/db/clients.sql"/>
 	</jdbc:initialize-database>
 	
+	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
+ 		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.HSQLPlatform" />
+		<property name="showSql" value="true" />
+	</bean>
+
 	<!--  The following is for connecting to a MySQL database that has been initialized with 
 			src/main/resources/db/tables/mysql_database_tables.sql -->
 	<!-- 
@@ -34,5 +39,11 @@
 		<property name="username" value="oic" />
 		<property name="password" value="oic" />		
 	</bean>
+
+	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
+		<property name="databasePlatform" value="org.eclipse.persistence.platform.database.MySQLPlatform" />
+		<property name="showSql" value="true" />
+	</bean>
+
 	-->
 </beans>
\ No newline at end of file