diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index dbc7ff7b..e5d88391 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -28,8 +28,9 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format(
     port=port,
     )
 
-if settings.DEBUG:	    
-    database_url = 'sqlite:///db.sqlite3'
+if settings.DEBUG or user=='':	    
+    # database_url = 'sqlite:///db.sqlite3'
+    database_url = 'sqlite:///'+database_name
 
 engine = create_engine(database_url, echo=False)
 
diff --git a/rowers/models.py b/rowers/models.py
index 4abb804d..552d6440 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -28,7 +28,7 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format(
     port=port,
     )
 
-if settings.DEBUG:	    
+if settings.DEBUG or user=='':	    
     database_url = 'sqlite:///db.sqlite3'
 
 engine = create_engine(database_url, echo=False)
diff --git a/rowers/tests.py b/rowers/tests.py
index 8f075065..66f309b8 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -1,4 +1,4 @@
-from django.test import TestCase, Client
+from django.test import TestCase, Client,override_settings
 from django.test.client import RequestFactory
 from .views import checkworkoutuser,c2_open
 from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage