diff --git a/account-ui/src/main/resources/META-INF/persistence.xml b/account-ui/src/main/resources/META-INF/persistence.xml
index ce53a8a..8bd0565 100644
--- a/account-ui/src/main/resources/META-INF/persistence.xml
+++ b/account-ui/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
   <persistence-unit name="de.muehlencord.shared.accountUiPu" transaction-type="JTA">
-    <jta-data-source>java:/jboss/accountTestDs</jta-data-source>    
+    <jta-data-source>java:/jboss/accountDs</jta-data-source>    
     <class>de.muehlencord.shared.account.business.account.entity.AccountEntity</class>
     <class>de.muehlencord.shared.account.business.account.entity.AccountHistoryEntity</class>
     <class>de.muehlencord.shared.account.business.account.entity.AccountLoginEntity</class>
diff --git a/account-ui/src/main/webapp/WEB-INF/shiro.ini b/account-ui/src/main/webapp/WEB-INF/shiro.ini
index 153b226..56c2a5b 100644
--- a/account-ui/src/main/webapp/WEB-INF/shiro.ini
+++ b/account-ui/src/main/webapp/WEB-INF/shiro.ini
@@ -4,8 +4,7 @@ securityManager.cacheManager = $cacheManager
 
 # DataSource Setup
 datasource = org.apache.shiro.jndi.JndiObjectFactory
-datasource.resourceName = java:/jboss/accountTestDs 
-# TODO - change to accountDs
+datasource.resourceName = java:/jboss/accountDs 
 datasource.resourceRef = true
 
 # HashService