diff --git a/crowdbox/settings.py b/crowdbox/settings.py
index 17354c5..7cfccc4 100644
--- a/crowdbox/settings.py
+++ b/crowdbox/settings.py
@@ -37,7 +37,7 @@
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 TEMPLATE_DEBUG = True
 
diff --git a/website/templates/welcome.html b/website/templates/welcome.html
index 473530d..ddd5ff9 100644
--- a/website/templates/welcome.html
+++ b/website/templates/welcome.html
@@ -6,7 +6,7 @@
         <img src="{% static 'img/logo_256.jpg' %}">
         <h3 class='center'>Make the crowd crop objects on images you want.</h3>
         <p>
-            <a href="{% url 'socialauth_begin' 'dropbox' %}" class="btn btn-lg btn-dropbox-inversed">
+            <a href="{% url 'socialauth_begin' 'dropbox' %}?next={% url 'website-info' %}" class="btn btn-lg btn-dropbox-inversed">
                 <i class="fa fa-dropbox"></i> login via Dropbox
             </a>
             <a href="{% url 'website-info'%}" class="btn btn-lg btn-default">