diff --git a/account/sql/account.dbm b/account/sql/account.dbm
index ef5e352..aa7455d 100644
--- a/account/sql/account.dbm
+++ b/account/sql/account.dbm
@@ -27,7 +27,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 		<type name="varchar" length="200"/>
 	</column>
 	<column name="config_value">
-		<type name="varchar" length="200"/>
+		<type name="varchar" length="2000"/>
 	</column>
 	<constraint name="config_pk" type="pk-constr" table="public.config">
 		<columns names="application,config_key,config_key_account" ref-type="src-columns"/>
diff --git a/account/sql/drop_all_tables.sql b/account/sql/drop_all_tables.sql
index 34ae73a..2a19a6f 100644
--- a/account/sql/drop_all_tables.sql
+++ b/account/sql/drop_all_tables.sql
@@ -7,4 +7,5 @@ DROP TABLE IF EXISTS application_role CASCADE;
 DROP TABLE IF EXISTS application_permission CASCADE;
 DROP TABLE IF EXISTS application CASCADE;
 DROP TABLE IF EXISTS account_history CASCADE;
-DROP TABLE IF EXISTS mail_template CASCADE;
\ No newline at end of file
+DROP TABLE IF EXISTS mail_template CASCADE;
+DROP TABLE IF EXISTS api_key CASCADE;
\ No newline at end of file
diff --git a/account/src/main/java/de/muehlencord/shared/account/business/config/boundary/ConfigService.java b/account/src/main/java/de/muehlencord/shared/account/business/config/boundary/ConfigService.java
index 2dbd6f2..f0a8cd8 100644
--- a/account/src/main/java/de/muehlencord/shared/account/business/config/boundary/ConfigService.java
+++ b/account/src/main/java/de/muehlencord/shared/account/business/config/boundary/ConfigService.java
@@ -134,6 +134,21 @@ public class ConfigService implements Serializable {
 
         return configValue;
     }
+    
+    @Lock(LockType.READ)
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+    public String getConfigValue(String configKey, String defaultValue, String accountName, boolean fallbackToSystem) throws ConfigException {
+        Account account = getAccount(accountName);
+        if (account == null) {
+            if (fallbackToSystem) {
+                return getConfigValue (configKey);
+            } else {
+                return defaultValue;
+            }                    
+        } else {
+            return getConfigValue (configKey, account, fallbackToSystem);
+        }        
+    }    
 
     @Lock(LockType.READ)
     @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
diff --git a/account/src/main/java/de/muehlencord/shared/account/business/config/entity/ConfigEntity.java b/account/src/main/java/de/muehlencord/shared/account/business/config/entity/ConfigEntity.java
index 5aa5d46..4728689 100644
--- a/account/src/main/java/de/muehlencord/shared/account/business/config/entity/ConfigEntity.java
+++ b/account/src/main/java/de/muehlencord/shared/account/business/config/entity/ConfigEntity.java
@@ -71,7 +71,7 @@ public class ConfigEntity implements Serializable {
 
     @EmbeddedId
     protected ConfigEntityPK configPK;
-    @Size(max = 200)
+    @Size(max = 2000)
     @Column(name = "config_value")
     private String configValue;
     @Size(max = 200)