diff --git a/source/madpy/djangoMad/apps/updata/views.py b/source/madpy/djangoMad/apps/updata/views.py
index 19a5255..1a5d900 100755
--- a/source/madpy/djangoMad/apps/updata/views.py
+++ b/source/madpy/djangoMad/apps/updata/views.py
@@ -4,6 +4,7 @@ from django.shortcuts import render
 from apps.updata.forms import UpdataForm, ExpForm
 from django.core.files.storage import FileSystemStorage
 from django.contrib import messages
+from django.conf import settings
 
 import os
 import glob
@@ -14,7 +15,7 @@ import madrigal.metadata
 import madrigal.ui.web
 import madrigal.admin
 
-@login_required(login_url='/madrigal/accounts/login/')
+@login_required(login_url='/{}/accounts/login/'.format(settings.BASE_URL))
 def index(request):
     '''
     Uploading experiments data view. Allows user to upload experiment files
diff --git a/source/madpy/djangoMad/djangoMad/settings.py b/source/madpy/djangoMad/djangoMad/settings.py
index 6555a43..ff5c4de 100644
--- a/source/madpy/djangoMad/djangoMad/settings.py
+++ b/source/madpy/djangoMad/djangoMad/settings.py
@@ -131,6 +131,8 @@ MEDIA_URL = '/media/'
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/madrigal/static/'
 STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
+BASE_URL = 'madrigal'
+#BASE_URL = 'observatorios/radio-observatorio-jicamarca/madrigal'
 
 BOOTSTRAP3 = {
     # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
diff --git a/source/madpy/djangoMad/djangoMad/urls.py b/source/madpy/djangoMad/djangoMad/urls.py
index b620127..c1407ee 100644
--- a/source/madpy/djangoMad/djangoMad/urls.py
+++ b/source/madpy/djangoMad/djangoMad/urls.py
@@ -1,12 +1,18 @@
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.conf import settings
 import madweb.views
 
+if settings.BASE_URL:
+    base = settings.BASE_URL + '/'
+else:
+    base = ''
+
 urlpatterns = [
-    url(r'^madrigal/', include('madweb.urls')),
-    url(r'^$', madweb.views.index),
-    url(r'^madrigal/updata/', include('apps.updata.urls', namespace="updata")),
-    url(r'^madrigal/accounts/', include('apps.login.urls', namespace="login")),
-    url(r'^madrigal/admin/', admin.site.urls),
- #   url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
+    url(r'^{}'.format(base), include('madweb.urls')),
+    # url(r'^$', madweb.views.index),
+    url(r'^{}updata/'.format(base), include('apps.updata.urls', namespace="updata")),
+    url(r'^{}accounts/'.format(base), include('apps.login.urls', namespace="login")),
+    url(r'^{}admin/'.format(base), admin.site.urls),
+    # url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
 ]