diff --git a/oxdb/backend/urls.py b/oxdb/backend/urls.py
index 13c0237b5..481095624 100644
--- a/oxdb/backend/urls.py
+++ b/oxdb/backend/urls.py
@@ -5,7 +5,7 @@ from django.conf.urls.defaults import *
 
 
 urlpatterns = patterns("backend.views",
-    (r'^upload/', 'firefogg_upload'),
+    (r'^upload/$', 'firefogg_upload'),
     (r'^$', 'api'),
 )
 
diff --git a/oxdb/settings.py b/oxdb/settings.py
index 4d04ccc91..0d3f18d69 100644
--- a/oxdb/settings.py
+++ b/oxdb/settings.py
@@ -30,6 +30,13 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 
 #CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
 
+#rabbitmq connection settings
+BROKER_HOST = "127.0.0.1"
+BROKER_PORT = 5672
+BROKER_USER = "oxdb"
+BROKER_PASSWORD = "0xdb"
+BROKER_VHOST = "/oxdb"
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -103,13 +110,6 @@ INSTALLED_APPS = (
 
 AUTH_PROFILE_MODULE = 'oxuser.UserProfile'
 
-#rabbitmq connection settings
-BROKER_HOST = "127.0.0.1"
-BROKER_PORT = 5672
-BROKER_USER = "oxdb"
-BROKER_PASSWORD = "0xdb"
-BROKER_VHOST = "/oxdb"
-
 #Video encoding settings
 VIDEO_PROFILE = 'low' # possible values low, mid or high
 VIDEO_ENCODING = {