diff --git a/lib/galaxy/model/orm/scripts.py b/lib/galaxy/model/orm/scripts.py
index e16fb608f82..95f38a2615e 100644
--- a/lib/galaxy/model/orm/scripts.py
+++ b/lib/galaxy/model/orm/scripts.py
@@ -136,8 +136,9 @@ def get_config(argv, use_argparse=True, cwd=None):
         db_url = properties["%sdatabase_connection" % config_prefix]
     else:
         db_url = "sqlite:///%s?isolation_level=IMMEDIATE" % os.path.join(get_data_dir(properties), default_sqlite_file)
+    install_database_connection = properties.get('install_database_connection')
 
-    return dict(db_url=db_url, repo=repo, config_file=config_file, database=database)
+    return dict(db_url=db_url, repo=repo, config_file=config_file, database=database, install_database_connection=install_database_connection)
 
 
 def manage_db():
diff --git a/scripts/create_db.py b/scripts/create_db.py
index bd0c7aac83b..39d808c8065 100755
--- a/scripts/create_db.py
+++ b/scripts/create_db.py
@@ -33,7 +33,7 @@ log = logging.getLogger(__name__)
 def invoke_create():
     config = get_config(sys.argv)
     if config['database'] == 'galaxy':
-        create_db(config['db_url'], config['config_file'])
+        create_db(config['db_url'], config['config_file'], map_install_models=not config['install_database_connection'])
     elif config['database'] == 'tool_shed':
         create_tool_shed_db(config['db_url'])
     elif config['database'] == 'install':