diff --git a/app/Config/bootstrap.default.php b/app/Config/bootstrap.default.php
index f0c9d14e9..9c21ed5ce 100644
--- a/app/Config/bootstrap.default.php
+++ b/app/Config/bootstrap.default.php
@@ -107,6 +107,16 @@ if (!$relativePaths) {
 	}
 }
 
+/**
+ * Configure base URL for CakePHP
+ */
+if (Configure::read('MISP.baseurl')) {
+	$regex = "%^(?<proto>https?)://(?<host>(?:(?:\w|-)+\.)+[a-z]{2,5})(?::(?<port>[0-9]+))?(?<base>/[a-z0-9_\-\.]+)?$%i";
+	if (preg_match($regex, Configure::read('MISP.baseurl'), $matches)) {
+		if (isset($matches['base'])) Configure::write('App.base', $matches['base']);
+	}
+}
+
 /**
  * Plugins need to be loaded manually, you can either load them one by one or all of them in a single call
  * Uncomment one of the lines below, as you need. make sure you read the documentation on CakePlugin to use more
diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index 50cbaf378..b3354c23d 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -294,7 +294,7 @@ class RestResponseComponent extends Component
                         $action = substr($action, 6);
                         $admin_routing = 'admin/';
                     }
-                    $url = '/' . $admin_routing . $controller . '/' . $action;
+                    $url = $baseurl . '/' . $admin_routing . $controller . '/' . $action;
                     $result[$url] = $data;
                 }
             }
@@ -337,7 +337,7 @@ class RestResponseComponent extends Component
                         }
                     }
                     $data['body'] = json_encode($data['body'], JSON_PRETTY_PRINT);
-                    $url = '/' . $admin_routing . $controller . '/' . $action;
+                    $url = $baseurl . '/' . $admin_routing . $controller . '/' . $action;
                     $data['url'] = $url;
                     if (!empty($data['params'])) {
                         foreach ($data['params'] as $param) {
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index f3184a104..0cf190b6f 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1529,7 +1529,7 @@ class EventsController extends AppController
         }
         $this->set('contributors', $contributors);
         $this->set('typeGroups', array_keys($this->Event->Attribute->typeGroupings));
-        $attributeUri = '/events/viewEventAttributes/' . $event['Event']['id'];
+        $attributeUri = $baseurl . '/events/viewEventAttributes/' . $event['Event']['id'];
         foreach ($this->params->named as $k => $v) {
             if (!is_numeric($k)) {
                 if (is_array($v)) {
@@ -1989,7 +1989,7 @@ class EventsController extends AppController
                 } else {
                     if ($this->_isRest()) { // TODO return error if REST
                         if (is_numeric($add)) {
-                            $this->response->header('Location', Configure::read('MISP.baseurl') . '/events/' . $add);
+                            $this->response->header('Location', $baseurl . '/events/' . $add);
                             $this->response->send();
                             throw new NotFoundException(__('Event already exists, if you would like to edit it, use the url in the location header.'));
                         }
@@ -2606,7 +2606,7 @@ class EventsController extends AppController
                 if (!empty($errors)) {
                     $this->set('errors', $errors);
                 }
-                $this->set('url', '/events/publishSightings/' . $id);
+                $this->set('url', $baseurl . '/events/publishSightings/' . $id);
                 $this->set('id', $id);
                 $this->set('_serialize', array('name', 'message', 'url', 'id', 'errors'));
             } else {
@@ -2673,7 +2673,7 @@ class EventsController extends AppController
                 if (!empty($errors)) {
                     $this->set('errors', $errors);
                 }
-                $this->set('url', '/events/alert/' . $id);
+                $this->set('url', $baseurl . '/events/alert/' . $id);
                 $this->set('id', $id);
                 $this->set('_serialize', array('name', 'message', 'url', 'id', 'errors'));
             } else {
@@ -2758,7 +2758,7 @@ class EventsController extends AppController
                 if (!empty($errors)) {
                     $this->set('errors', $errors);
                 }
-                $this->set('url', '/events/alert/' . $id);
+                $this->set('url', $baseurl . '/events/alert/' . $id);
                 $this->set('id', $id);
                 $this->set('_serialize', array('name', 'message', 'url', 'id', 'errors'));
             } else {
@@ -3946,89 +3946,89 @@ class EventsController extends AppController
         // #TODO i18n
         $exports = array(
             'xml' => array(
-                    'url' => '/events/restSearch/xml/eventid:' . $id . '.xml',
+                    'url' => $baseurl . '/events/restSearch/xml/eventid:' . $id . '.xml',
                     'text' => 'MISP XML (metadata + all attributes)',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Encode Attachments',
-                    'checkbox_set' => '/events/restSearch/xml/eventid:' . $id . '/withAttachments:1.xml',
+                    'checkbox_set' => $baseurl . '/events/restSearch/xml/eventid:' . $id . '/withAttachments:1.xml',
                     'checkbox_default' => true
             ),
             'json' => array(
-                    'url' => '/events/restSearch/json/eventid:' . $id . '.json',
+                    'url' => $baseurl . '/events/restSearch/json/eventid:' . $id . '.json',
                     'text' => 'MISP JSON (metadata + all attributes)',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Encode Attachments',
-                    'checkbox_set' => '/events/restSearch/json/withAttachments:1/eventid:' . $id . '.json',
+                    'checkbox_set' => $baseurl . '/events/restSearch/json/withAttachments:1/eventid:' . $id . '.json',
                     'checkbox_default' => true
             ),
             'openIOC' => array(
-                    'url' => '/events/restSearch/openioc/to_ids:1/published:1/eventid:' . $id . '.json',
+                    'url' => $baseurl .'/events/restSearch/openioc/to_ids:1/published:1/eventid:' . $id . '.json',
                     'text' => 'OpenIOC (all indicators marked to IDS)',
                     'requiresPublished' => false,
                     'checkbox' => false,
             ),
             'csv' => array(
-                    'url' => '/events/restSearch/returnFormat:csv/to_ids:1/published:1/includeContext:0/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/returnFormat:csv/to_ids:1/published:1/includeContext:0/eventid:' . $id,
                     'text' => 'CSV',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Include non-IDS marked attributes',
-                    'checkbox_set' => '/events/restSearch/returnFormat:csv/to_ids:1||0/published:1||0/includeContext:0/eventid:' . $id
+                    'checkbox_set' => $baseurl . '/events/restSearch/returnFormat:csv/to_ids:1||0/published:1||0/includeContext:0/eventid:' . $id
             ),
             'csv_with_context' => array(
-                    'url' => '/events/restSearch/returnFormat:csv/to_ids:1/published:1/includeContext:1/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/returnFormat:csv/to_ids:1/published:1/includeContext:1/eventid:' . $id,
                     'text' => 'CSV with additional context',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Include non-IDS marked attributes',
-                    'checkbox_set' => '/events/restSearch/returnFormat:csv/to_ids:1||0/published:1||0/includeContext:1/eventid:' . $id
+                    'checkbox_set' => $baseurl . '/events/restSearch/returnFormat:csv/to_ids:1||0/published:1||0/includeContext:1/eventid:' . $id
             ),
             'stix_xml' => array(
-                    'url' => '/events/restSearch/stix/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/stix/eventid:' . $id,
                     'text' => 'STIX XML (metadata + all attributes)',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Encode Attachments',
-                    'checkbox_set' => '/events/restSearch/stix/eventid:' . $id . '/withAttachments:1'
+                    'checkbox_set' => $baseurl . '/events/restSearch/stix/eventid:' . $id . '/withAttachments:1'
             ),
             'stix_json' => array(
-                    'url' => '/events/restSearch/stix-json/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/stix-json/eventid:' . $id,
                     'text' => 'STIX JSON (metadata + all attributes)',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Encode Attachments',
-                    'checkbox_set' => '/events/restSearch/stix-json/withAttachments:1/eventid:' . $id
+                    'checkbox_set' => $baseurl . '/events/restSearch/stix-json/withAttachments:1/eventid:' . $id
             ),
             'stix2_json' => array(
-                    'url' => '/events/restSearch/stix2/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/stix2/eventid:' . $id,
                     'text' => 'STIX2 (requires the STIX 2 library)',
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Encode Attachments',
-                    'checkbox_set' => '/events/restSearch/stix2/eventid:' . $id . '/withAttachments:1'
+                    'checkbox_set' => $baseurl . '/events/restSearch/stix2/eventid:' . $id . '/withAttachments:1'
             ),
             'rpz' => array(
-                    'url' => '/attributes/restSearch/returnFormat:rpz/published:1||0/eventid:' . $id,
+                    'url' => $baseurl . '/attributes/restSearch/returnFormat:rpz/published:1||0/eventid:' . $id,
                     'text' => 'RPZ Zone file',
                     'requiresPublished' => false,
                     'checkbox' => false,
             ),
             'suricata' => array(
-                    'url' => '/events/restSearch/returnFormat:suricata/published:1||0/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/returnFormat:suricata/published:1||0/eventid:' . $id,
                     'text' => 'Download Suricata rules',
                     'requiresPublished' => false,
                     'checkbox' => false,
             ),
             'snort' => array(
-                    'url' => '/events/restSearch/returnFormat:snort/published:1||0/eventid:' . $id,
+                    'url' => $baseurl . '/events/restSearch/returnFormat:snort/published:1||0/eventid:' . $id,
                     'text' => 'Download Snort rules',
                     'requiresPublished' => false,
                     'checkbox' => false,
             ),
             'bro' => array(
-                    'url' => '/attributes/bro/download/all/false/' . $id,
+                    'url' => $baseurl . '/attributes/bro/download/all/false/' . $id,
                     // 'url' => '/attributes/restSearch/returnFormat:bro/published:1||0/eventid:' . $id,
                     'text' => 'Download Bro rules',
                     'requiresPublished' => false,
@@ -4036,11 +4036,11 @@ class EventsController extends AppController
             ),
             'text' => array(
                     'text' => 'Export all attribute values as a text file',
-                    'url' => '/attributes/restSearch/returnFormat:text/published:1||0/eventid:' . $id,
+                    'url' => $baseurl . '/attributes/restSearch/returnFormat:text/published:1||0/eventid:' . $id,
                     'requiresPublished' => false,
                     'checkbox' => true,
                     'checkbox_text' => 'Include non-IDS marked attributes',
-                    'checkbox_set' => '/attributes/restSearch/returnFormat:text/published:1||0/to_ids:1||0/eventid:' . $id
+                    'checkbox_set' => $baseurl . '/attributes/restSearch/returnFormat:text/published:1||0/to_ids:1||0/eventid:' . $id
             ),
         );
         if ($event['Event']['published'] == 0) {
@@ -4050,7 +4050,7 @@ class EventsController extends AppController
                 }
             }
             $exports['csv'] = array(
-                'url' => '/events/restSearch/returnFormat:csv/includeContext:0/eventid:' . $id,
+                'url' => $baseurl . '/events/restSearch/returnFormat:csv/includeContext:0/eventid:' . $id,
                 'text' => 'CSV (event not published, IDS flag ignored)',
                 'requiresPublished' => false,
                 'checkbox' => false
@@ -4061,7 +4061,7 @@ class EventsController extends AppController
         if (is_array($modules) && !empty($modules)) {
             foreach ($modules['modules'] as $module) {
                 $exports[$module['name']] = array(
-                        'url' => '/events/exportModule/' . $module['name'] . '/' . $id,
+                        'url' => $baseurl . '/events/exportModule/' . $module['name'] . '/' . $id,
                         'text' => Inflector::humanize($module['name']),
                         'requiresPublished' => true,
                         'checkbox' => false,
@@ -4085,29 +4085,31 @@ class EventsController extends AppController
             }
             $imports = array(
                     'freetext' => array(
-                            'url' => '/events/freeTextImport/' . $id,
+                            'url' => $baseurl . '/events/freeTextImport/' . $id,
                             'text' => __('Freetext Import'),
                             'ajax' => true,
                             'target' => 'popover_form'
                     ),
                     'template' => array(
-                            'url' => '/templates/templateChoices/' . $id,
+                            'url' => $baseurl . '/templates/templateChoices/' . $id,
                             'text' => __('Populate using a Template'),
                             'ajax' => true,
                             'target' => 'popover_form'
                     ),
                     'OpenIOC' => array(
-                            'url' => '/events/addIOC/' . $id,
+                            'url' => $baseurl . '/events/addIOC/' . $id,
                             'text' => __('OpenIOC Import'),
+                            'url' => $baseurl . '/events/addIOC/' . $id,
+                            'text' => 'OpenIOC Import',
                             'ajax' => false,
                     ),
                     'ThreatConnect' => array(
-                            'url' => '/attributes/add_threatconnect/' . $id,
+                            'url' => $baseurl . '/attributes/add_threatconnect/' . $id,
                             'text' => __('ThreatConnect Import'),
                             'ajax' => false
                     ),
                     'Forensic analysis' => array(
-                        'url' => '/events/upload_analysis_file/'.$id,
+                        'url' => $baseurl . '/events/upload_analysis_file/'.$id,
                         'text' => __('(Experimental) Forensic analysis - Mactime'),
                         'ajax' => false,
                 )
@@ -4117,7 +4119,7 @@ class EventsController extends AppController
             if (is_array($modules) && !empty($modules)) {
                 foreach ($modules['modules'] as $k => $module) {
                     $imports[$module['name']] = array(
-                            'url' => '/events/importModule/' . $module['name'] . '/' . $id,
+                            'url' => $baseurl . '/events/importModule/' . $module['name'] . '/' . $id,
                             'text' => Inflector::humanize($module['name']),
                             'ajax' => false
                     );
@@ -4126,18 +4128,18 @@ class EventsController extends AppController
         } else {
             $imports = array(
                 'MISP' => array(
-                        'url' => '/events/add_misp_export',
+                        'url' => $baseurl . '/events/add_misp_export',
                         'text' => __('MISP standard (recommended exchange format - lossless)'),
                         'ajax' => false,
                         'bold' => true
                 ),
                 'STIX' => array(
-                        'url' => '/events/upload_stix',
+                        'url' => $baseurl . '/events/upload_stix',
                         'text' => __('STIX 1.1.1 format (lossy)'),
                         'ajax' => false,
                 ),
                 'STIX2' => array(
-                        'url' => '/events/upload_stix/2',
+                        'url' => $baseurl . '/events/upload_stix/2',
                         'text' => __('STIX 2.0 format (lossy)'),
                         'ajax' => false,
                 )
@@ -4358,7 +4360,7 @@ class EventsController extends AppController
             if ($successCount > 0) {
                 $this->set('name', 'Partial success');
                 $this->set('message', 'Successfuly saved ' . $successCount . ' sample(s), but some samples could not be saved.');
-                $this->set('url', '/events/view/' . $data['settings']['event_id']);
+                $this->set('url', $baseurl . '/events/view/' . $data['settings']['event_id']);
                 $this->set('id', $data['settings']['event_id']);
                 $this->set('_serialize', array('name', 'message', 'url', 'id', 'errors'));
             } else {
@@ -4369,7 +4371,7 @@ class EventsController extends AppController
         } else {
             $this->set('name', 'Success');
             $this->set('message', 'Success, saved all attributes.');
-            $this->set('url', '/events/view/' . $data['settings']['event_id']);
+            $this->set('url', $baseurl . '/events/view/' . $data['settings']['event_id']);
             $this->set('id', $data['settings']['event_id']);
             $this->set('_serialize', array('name', 'message', 'url', 'id'));
         }
diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index 6db67b8ab..c22808062 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -155,14 +155,14 @@ class GalaxiesController extends AppController
         $items = array(
             array(
                 'name' => __('All clusters'),
-                'value' => "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local
+                'value' => $baseurl . "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local
             )
         );
         foreach ($galaxies as $galaxy) {
             if (!isset($galaxy['Galaxy']['kill_chain_order'])) {
                 $items[] = array(
                     'name' => h($galaxy['Galaxy']['name']),
-                    'value' => "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local,
+                    'value' => $baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local,
                     'template' => array(
                         'preIcon' => 'fa-' . $galaxy['Galaxy']['icon'],
                         'name' => $galaxy['Galaxy']['name'],
@@ -183,7 +183,7 @@ class GalaxiesController extends AppController
                     'isMatrix' => true
                 );
                 if ($galaxy['Galaxy']['id'] == $mitreAttackGalaxyId) {
-                    $param['img'] = "/img/mitre-attack-icon.ico";
+                    $param['img'] = $baseurl . "/img/mitre-attack-icon.ico";
                 }
                 $items[] = $param;
             }
@@ -205,12 +205,12 @@ class GalaxiesController extends AppController
         $items = array();
         $items[] = array(
             'name' => __('All namespaces'),
-            'value' => "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/local:' . $local
+            'value' => $baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/local:' . $local
         );
         foreach ($namespaces as $namespace) {
             $items[] = array(
                 'name' => $namespace,
-                'value' => "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/local:' . $local
+                'value' => $baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/local:' . $local
             );
         }
 
diff --git a/app/Controller/ObjectTemplatesController.php b/app/Controller/ObjectTemplatesController.php
index b4f6c8031..39e378855 100644
--- a/app/Controller/ObjectTemplatesController.php
+++ b/app/Controller/ObjectTemplatesController.php
@@ -29,12 +29,12 @@ class ObjectTemplatesController extends AppController
         $items = array();
         $items[] = array(
             'name' => __('All Objects'),
-            'value' => "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . "0"
+            'value' => $baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . "0"
         );
         foreach($metas as $meta) {
             $items[] = array(
                 'name' => $meta,
-                'value' => "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . h($meta)
+                'value' => $baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . h($meta)
             );
         }
 
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 5444dc0a7..10981017e 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1745,7 +1745,7 @@ class ServersController extends AppController
             'recommendBackup' => false,
             'exitOnError' => false,
             'requirements' => '',
-            'url' => '/'
+            'url' => $baseurl . '/'
         );
         foreach($actions as $id => $action) {
             foreach($default_fields as $field => $value) {
diff --git a/app/Controller/ShadowAttributesController.php b/app/Controller/ShadowAttributesController.php
index c3c634dc2..ce2bfcfcf 100644
--- a/app/Controller/ShadowAttributesController.php
+++ b/app/Controller/ShadowAttributesController.php
@@ -171,7 +171,7 @@ class ShadowAttributesController extends AppController
                 $response['check_publish'] = true;
                 $this->set('name', $response['success']);
                 $this->set('message', $response['success']);
-                $this->set('url', '/shadow_attributes/accept/' . $id);
+                $this->set('url', $baseurl . '/shadow_attributes/accept/' . $id);
                 $this->set('_serialize', array('name', 'message', 'url'));
             } else {
                 throw new MethodNotAllowedException($response['errors']);
@@ -223,7 +223,7 @@ class ShadowAttributesController extends AppController
                 if ($this->_isRest()) {
                     $this->set('name', 'Proposal discarded.');
                     $this->set('message', 'Proposal discarded.');
-                    $this->set('url', '/shadow_attributes/discard/' . $id);
+                    $this->set('url', $baseurl . '/shadow_attributes/discard/' . $id);
                     $this->set('_serialize', array('name', 'message', 'url'));
                 } else {
                     $this->autoRender = false;
@@ -865,7 +865,7 @@ class ShadowAttributesController extends AppController
             $conditions['AND'][] = array(
                 'ShadowAttribute.deleted' => $this->request['named']['deleted']
             );
-        }
+       }
         if (!empty($this->request['named']['timestamp'])) {
             $conditions['AND'][] = array(
                 'ShadowAttribute.timestamp >=' => $this->request['named']['timestamp']
diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 5a9475a0d..5acb9b6dc 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -364,7 +364,7 @@ class TagsController extends AppController
             if ($this->_isRest()) {
                 $this->set('name', 'Tag deleted.');
                 $this->set('message', 'Tag deleted.');
-                $this->set('url', '/tags/delete/' . $id);
+                $this->set('url', $baseurl . '/tags/delete/' . $id);
                 $this->set('_serialize', array('name', 'message', 'url'));
             }
             $this->Flash->success(__('Tag deleted'));
@@ -574,22 +574,22 @@ class TagsController extends AppController
         if ($favourites) {
             $items[] = array(
                 'name' => __('Favourite Tags'),
-                'value' => "/tags/selectTag/" . h($id) . "/favourites/" . h($scope) . $localFlag
+                'value' => $baseurl . "/tags/selectTag/" . h($id) . "/favourites/" . h($scope) . $localFlag
             );
         }
         if ($scope !== 'tag_collection') {
             $items[] = array(
                 'name' => __('Tag Collections'),
-                'value' => "/tags/selectTag/" . h($id) . "/collections/" . h($scope) . $localFlag
+                'value' => $baseurl . "/tags/selectTag/" . h($id) . "/collections/" . h($scope) . $localFlag
             );
         }
         $items[] = array(
             'name' => __('Custom Tags'),
-            'value' => "/tags/selectTag/" . h($id) . "/0/" . h($scope) . $localFlag
+            'value' => $baseurl . "/tags/selectTag/" . h($id) . "/0/" . h($scope) . $localFlag
         );
         $items[] = array(
             'name' => __('All Tags'),
-            'value' => "/tags/selectTag/" . h($id) . "/all/" . h($scope) . $localFlag
+            'value' => $baseurl . "/tags/selectTag/" . h($id) . "/all/" . h($scope) . $localFlag
         );
 
         $this->loadModel('Taxonomy');
@@ -597,7 +597,7 @@ class TagsController extends AppController
         foreach ($options as $k => $option) {
             $items[] = array(
                 'name' => __('Taxonomy Library') . ":" . h($option),
-                'value' => "/tags/selectTag/" . h($id) . "/" . h($k) . "/" . h($scope . $localFlag)
+                'value' => $baseurl . "/tags/selectTag/" . h($id) . "/" . h($k) . "/" . h($scope . $localFlag)
             );
         }
         $this->set('items', $items);
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 8a7de5913..8dbac7b80 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -181,7 +181,7 @@ class Server extends AppModel
                         'branch' => 1,
                         'baseurl' => array(
                                 'level' => 0,
-                                'description' => __('The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function.'),
+                                'description' => __('The base url of the application (in the format https://www.mymispinstance.com or https://myserver.com/misp). Several features depend on this setting being correctly set to function.'),
                                 'value' => '',
                                 'errorMessage' => __('The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address).'),
                                 'test' => 'testBaseURL',
@@ -3568,7 +3568,10 @@ class Server extends AppModel
         if ($this->testForEmpty($value) !== true) {
             return $this->testForEmpty($value);
         }
-        if ($value != strtolower($this->getProto()) . '://' . $this->getHost()) {
+        $regex = "%^(?<proto>https?)://(?<host>(?:(?:\w|-)+\.)+[a-z]{2,5})(?::(?<port>[0-9]+))?(?<base>/[a-z0-9_\-\.]+)?$%i";
+	if ( !preg_match($regex, $value, $matches)
+                || strtolower($matches['proto']) != strtolower($this->getProto())
+                || strtolower($matches['host']) != strtolower($this->getHost()) ) {
             return 'Invalid baseurl, it has to be in the "https://FQDN" format.';
         }
         return true;
diff --git a/app/View/Attributes/ajax/attributeEditCategoryForm.ctp b/app/View/Attributes/ajax/attributeEditCategoryForm.ctp
index 0ff354bb3..6636ffe82 100644
--- a/app/View/Attributes/ajax/attributeEditCategoryForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditCategoryForm.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_category_form', 'url' => '/attributes/editField/' . $object['id']));
+    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_category_form', 'url' => $baseurl . '/attributes/editField/' . $object['id']));
 ?>
 <div class='inline-input inline-input-container'>
 <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Attributes/ajax/attributeEditCommentForm.ctp b/app/View/Attributes/ajax/attributeEditCommentForm.ctp
index 4e5695de1..cdbd266cc 100644
--- a/app/View/Attributes/ajax/attributeEditCommentForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditCommentForm.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_comment_form', 'url' => '/attributes/editField/' . $object['id']));
+    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_comment_form', 'url' => $baseurl . '/attributes/editField/' . $object['id']));
 ?>
     <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Attributes/ajax/attributeEditDistributionForm.ctp b/app/View/Attributes/ajax/attributeEditDistributionForm.ctp
index 79cecbb0c..7537b0811 100644
--- a/app/View/Attributes/ajax/attributeEditDistributionForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditDistributionForm.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_distribution_form', 'url' => '/attributes/editField/' . $object['id']));
+    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_distribution_form', 'url' => $baseurl . '/attributes/editField/' . $object['id']));
 ?>
 <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Attributes/ajax/attributeEditMassForm.ctp b/app/View/Attributes/ajax/attributeEditMassForm.ctp
index 56a792d00..48fa49ad2 100644
--- a/app/View/Attributes/ajax/attributeEditMassForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditMassForm.ctp
@@ -1,6 +1,6 @@
 <div class="attributes">
 <?php
-    echo $this->Form->create('Attribute', array('url' => '/attributes/editSelected/' . $id));
+    echo $this->Form->create('Attribute', array('url' => $baseurl . '/attributes/editSelected/' . $id));
 ?>
     <fieldset>
         <legend><?php echo __('Mass Edit Attributes'); ?></legend>
diff --git a/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp b/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp
index 583cd23eb..f05db3476 100644
--- a/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditTo_idsForm.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-    echo $this->Form->create('Attribute', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/attributes/editField/' . $object['id']));
+    echo $this->Form->create('Attribute', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/attributes/editField/' . $object['id']));
     echo $this->Form->input('to_ids', array(
         'options' => array(0 => 'No', 1 => 'Yes'),
         'label' => false,
diff --git a/app/View/Attributes/ajax/attributeEditTypeForm.ctp b/app/View/Attributes/ajax/attributeEditTypeForm.ctp
index b48004456..98bac6f3b 100644
--- a/app/View/Attributes/ajax/attributeEditTypeForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditTypeForm.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_type_form', 'url' => '/attributes/editField/' . $object['id']));
+    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'id' => 'Attribute_' . $object['id'] . '_type_form', 'url' => $baseurl . '/attributes/editField/' . $object['id']));
 ?>
 <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Attributes/ajax/attributeEditValueForm.ctp b/app/View/Attributes/ajax/attributeEditValueForm.ctp
index bc988e71c..9524a6427 100644
--- a/app/View/Attributes/ajax/attributeEditValueForm.ctp
+++ b/app/View/Attributes/ajax/attributeEditValueForm.ctp
@@ -1,6 +1,6 @@
 
 <?php
-    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'url' => '/attributes/editField/' . $object['id'], 'id' => 'Attribute_' . $object['id'] . '_value_form', 'default' => false));
+    echo $this->Form->create('Attribute', array('class' => 'inline-form inline-field-form', 'url' => $baseurl . '/attributes/editField/' . $object['id'], 'id' => 'Attribute_' . $object['id'] . '_value_form', 'default' => false));
 ?>
     <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Attributes/ajax/tagRemoveConfirmation.ctp b/app/View/Attributes/ajax/tagRemoveConfirmation.ctp
index 531945584..21faced18 100644
--- a/app/View/Attributes/ajax/tagRemoveConfirmation.ctp
+++ b/app/View/Attributes/ajax/tagRemoveConfirmation.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-    echo $this->Form->create($model, array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/' . strtolower($model) . 's/removeTag/' . $id . '/' . $tag_id));
+    echo $this->Form->create($model, array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/' . strtolower($model) . 's/removeTag/' . $id . '/' . $tag_id));
     $action = "removeObjectTag('" . $model . "', '" . h($id) . "', '" . h($tag_id) . "');";
     ?>
     <legend><?php echo __('Remove Tag'); ?></legend>
diff --git a/app/View/Attributes/ajax/toggle_correlation.ctp b/app/View/Attributes/ajax/toggle_correlation.ctp
index 41042e9b9..709b8aed9 100644
--- a/app/View/Attributes/ajax/toggle_correlation.ctp
+++ b/app/View/Attributes/ajax/toggle_correlation.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-    echo $this->Form->create('Attribute', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/attributes/toggleCorrelation/' . $attribute['Attribute']['id']));
+    echo $this->Form->create('Attribute', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/attributes/toggleCorrelation/' . $attribute['Attribute']['id']));
     $extraTitle = "";
     ?>
     <legend><?php echo __('Toggle Correlation %s ', $attribute['Attribute']['disable_correlation'] ? __('on') : __('off'));?></legend>
diff --git a/app/View/Attributes/attribute_replace.ctp b/app/View/Attributes/attribute_replace.ctp
index 6ee87cd62..5e3c5ce47 100644
--- a/app/View/Attributes/attribute_replace.ctp
+++ b/app/View/Attributes/attribute_replace.ctp
@@ -1,6 +1,6 @@
 <div class="attribute_replace">
 <?php
-echo $this->Form->create('Attribute', array('id', 'url' => '/attributes/attributeReplace/' . $event_id));
+echo $this->Form->create('Attribute', array('id', 'url' => $baseurl . '/attributes/attributeReplace/' . $event_id));
 ?>
     <fieldset>
         <legend><?php echo __('Attribute Replace Tool'); ?></legend>
diff --git a/app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp b/app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp
index ecf07c81d..72e21bd33 100644
--- a/app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp
+++ b/app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp
@@ -503,7 +503,7 @@ function cleanRules(rules) {
 function performQuery(rules) {
     var res = cleanRules(rules);
 
-    var url = "/events/viewEventAttributes/<?php echo h($event['Event']['id']); ?>";
+    var url = "<?php echo $baseurl; ?>/events/viewEventAttributes/<?php echo h($event['Event']['id']); ?>";
     $.ajax({
         type:"post",
         url: url,
diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index 46f1064c4..6d9b6cb15 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -338,7 +338,7 @@
             <?php
                 if ($object['distribution'] == 4):
             ?>
-                <a href="/sharing_groups/view/<?php echo h($object['sharing_group_id']); ?>"><?php echo h($object['SharingGroup']['name']);?></a>
+                <a href="<?php echo $baseurl;?>/sharing_groups/view/<?php echo h($object['sharing_group_id']); ?>"><?php echo h($object['SharingGroup']['name']);?></a>
             <?php
                 else:
                     echo h($shortDist[$object['distribution']]);
diff --git a/app/View/Elements/Events/View/row_object.ctp b/app/View/Elements/Events/View/row_object.ctp
index d433325b5..9f0fb08c0 100644
--- a/app/View/Elements/Events/View/row_object.ctp
+++ b/app/View/Elements/Events/View/row_object.ctp
@@ -107,7 +107,7 @@
         if ($object['objectType'] == 0) {
           if ($object['distribution'] == 4):
       ?>
-          <a href="/sharing_groups/view/<?php echo h($object['sharing_group_id']); ?>"><?php echo h($object['SharingGroup']['name']);?></a>
+	  <a href="<?php echo $baseurl; ?>/sharing_groups/view/<?php echo h($object['sharing_group_id']); ?>"><?php echo h($object['SharingGroup']['name']);?></a>
       <?php
           else:
             echo h($shortDist[$object['distribution']]);
diff --git a/app/View/Elements/Events/View/row_object_reference.ctp b/app/View/Elements/Events/View/row_object_reference.ctp
index d004e8523..1f7f6ecb6 100644
--- a/app/View/Elements/Events/View/row_object_reference.ctp
+++ b/app/View/Elements/Events/View/row_object_reference.ctp
@@ -25,7 +25,7 @@
 <?php
   if ($mayModify):
 ?>
-    <span class="fa fa-plus-square useCursorPointer" title="<?php echo __('Add reference');?>" role="button" tabindex="0" aria-label="<?php echo __('Add reference');?>" onClick="genericPopup('<?php echo '/objectReferences/add/' . h($object['id']);?>', '#popover_form');"></span>
+    <span class="fa fa-plus-square useCursorPointer" title="<?php echo __('Add reference');?>" role="button" tabindex="0" aria-label="<?php echo __('Add reference');?>" onClick="genericPopup('<?php echo $baseurl . '/objectReferences/add/' . h($object['id']);?>', '#popover_form');"></span>
 <?php
   endif;
 ?>
diff --git a/app/View/Elements/Events/View/row_proposal.ctp b/app/View/Elements/Events/View/row_proposal.ctp
index 50f9d3f58..d0f90b8b8 100644
--- a/app/View/Elements/Events/View/row_proposal.ctp
+++ b/app/View/Elements/Events/View/row_proposal.ctp
@@ -188,7 +188,7 @@
   <td class="short action-links">
     <?php
         if (($event['Orgc']['id'] == $me['org_id'] && $mayModify) || $isSiteAdmin) {
-          echo $this->Form->create('Shadow_Attribute', array('id' => 'ShadowAttribute_' . $object['id'] . '_accept', 'url' => '/shadow_attributes/accept/' . $object['id'], 'style' => 'display:none;'));
+          echo $this->Form->create('Shadow_Attribute', array('id' => 'ShadowAttribute_' . $object['id'] . '_accept', 'url' => $baseurl . '/shadow_attributes/accept/' . $object['id'], 'style' => 'display:none;'));
           echo $this->Form->end();
         ?>
           <span class="icon-ok icon-white useCursorPointer" title="<?php echo __('Accept Proposal');?>" role="button" tabindex="0" aria-label="<?php echo __('Accept proposal');?>" onClick="acceptObject('shadow_attributes', '<?php echo $object['id']; ?>', '<?php echo $event['Event']['id']; ?>');"></span>
diff --git a/app/View/Elements/Events/View/row_proposal_delete.ctp b/app/View/Elements/Events/View/row_proposal_delete.ctp
index 3359dd828..c89d0de46 100644
--- a/app/View/Elements/Events/View/row_proposal_delete.ctp
+++ b/app/View/Elements/Events/View/row_proposal_delete.ctp
@@ -74,7 +74,7 @@
   <td class="short action-links">
     <?php
         if (($event['Orgc']['id'] == $me['org_id'] && $mayModify) || $isSiteAdmin) {
-          echo $this->Form->create('Shadow_Attribute', array('id' => 'ShadowAttribute_' . $object['id'] . '_accept', 'url' => '/shadow_attributes/accept/' . $object['id'], 'style' => 'display:none;'));
+          echo $this->Form->create('Shadow_Attribute', array('id' => 'ShadowAttribute_' . $object['id'] . '_accept', 'url' => $baseurl . '/shadow_attributes/accept/' . $object['id'], 'style' => 'display:none;'));
           echo $this->Form->end();
         ?>
           <span class="icon-ok icon-white useCursorPointer" title="<?php echo __('Accept Proposal');?>" role="button" tabindex="0" aria-label="<?php echo __('Accept proposal');?>" onClick="acceptObject('shadow_attributes', '<?php echo $object['id']; ?>', '<?php echo $event['Event']['id']; ?>');"></span>
diff --git a/app/View/Elements/Events/View/sighting_field.ctp b/app/View/Elements/Events/View/sighting_field.ctp
index 139159314..4832df401 100644
--- a/app/View/Elements/Events/View/sighting_field.ctp
+++ b/app/View/Elements/Events/View/sighting_field.ctp
@@ -1,7 +1,7 @@
 <td class="shortish">
   <span id="sightingForm_<?php echo h($object['id']);?>">
   <?php
-      echo $this->Form->create('Sighting', array('id' => 'Sighting_' . $object['id'], 'url' => '/sightings/add/' . $object['id'], 'style' => 'display:none;'));
+      echo $this->Form->create('Sighting', array('id' => 'Sighting_' . $object['id'], 'url' => $baseurl . '/sightings/add/' . $object['id'], 'style' => 'display:none;'));
       echo $this->Form->input('type', array('label' => false, 'id' => 'Sighting_' . $object['id'] . '_type'));
       echo $this->Form->end();
   ?>
diff --git a/app/View/Elements/Feeds/eventattribute.ctp b/app/View/Elements/Feeds/eventattribute.ctp
index 97b654325..770eb8fcf 100644
--- a/app/View/Elements/Feeds/eventattribute.ctp
+++ b/app/View/Elements/Feeds/eventattribute.ctp
@@ -102,7 +102,7 @@
         </ul>
     </div>
 <script type="text/javascript">
-    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : '/feeds/previewEvent/' . h($feed['Feed']['id']) . '/' . h($event['Event']['uuid']); ?>";
+    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : $baseurl . '/feeds/previewEvent/' . h($feed['Feed']['id']) . '/' . h($event['Event']['uuid']); ?>";
     var lastSelected = false;
     var deleted = <?php echo (isset($deleted) && $deleted) ? 'true' : 'false';?>;
     $(document).ready(function() {
diff --git a/app/View/Elements/Servers/eventattribute.ctp b/app/View/Elements/Servers/eventattribute.ctp
index 8493889fb..daf962388 100644
--- a/app/View/Elements/Servers/eventattribute.ctp
+++ b/app/View/Elements/Servers/eventattribute.ctp
@@ -102,7 +102,7 @@
         </ul>
     </div>
 <script type="text/javascript">
-    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : '/servers/previewEvent/' . h($server['Server']['id']) . '/' . h($event['Event']['id']); ?>";
+    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : $baseurl . '/servers/previewEvent/' . h($server['Server']['id']) . '/' . h($event['Event']['id']); ?>";
     var lastSelected = false;
     var deleted = <?php echo (isset($deleted) && $deleted) ? 'true' : 'false';?>;
     $(document).ready(function() {
diff --git a/app/View/Elements/Users/userIndexTable.ctp b/app/View/Elements/Users/userIndexTable.ctp
index 2e171d6ec..80c736f7e 100644
--- a/app/View/Elements/Users/userIndexTable.ctp
+++ b/app/View/Elements/Users/userIndexTable.ctp
@@ -32,7 +32,7 @@
                     <?php echo h($user['User']['id']); ?>&nbsp;
                 </td>
                 <td class="short" ondblclick="document.location ='<?php echo $this->Html->url(array('admin' => true, 'action' => 'view', $user['User']['id']), true);?>';">
-                    <a href="/organisations/view/<?php echo $user['Organisation']['id'];?>"><?php echo h($user['Organisation']['name']); ?>&nbsp;</a>
+		    <a href="<?php echo $baseurl; ?>/organisations/view/<?php echo $user['Organisation']['id'];?>"><?php echo h($user['Organisation']['name']); ?>&nbsp;</a>
                 </td>
                 <td class="short" ondblclick="document.location ='<?php echo $this->Html->url(array('admin' => true, 'action' => 'view', $user['User']['id']), true);?>';">
                     <?php echo $this->Html->link($user['Role']['name'], array('controller' => 'roles', 'action' => 'view', $user['Role']['id'])); ?>
diff --git a/app/View/Elements/eventattribute.ctp b/app/View/Elements/eventattribute.ctp
index 6687a12cb..91df2a897 100644
--- a/app/View/Elements/eventattribute.ctp
+++ b/app/View/Elements/eventattribute.ctp
@@ -74,7 +74,7 @@
 <br />
 <div id="edit_object_div">
     <?php
-        $deleteSelectedUrl = '/attributes/deleteSelected/' . $event['Event']['id'];
+        $deleteSelectedUrl = $baseurl . '/attributes/deleteSelected/' . $event['Event']['id'];
         if (empty($event['Event']['publish_timestamp'])) {
             $deleteSelectedUrl .= '/1';
         }
@@ -88,7 +88,7 @@
         echo $this->Form->end();
     ?>
         <?php
-        echo $this->Form->create('ShadowAttribute', array('id' => 'accept_selected', 'url' => '/shadow_attributes/acceptSelected/' . $event['Event']['id']));
+        echo $this->Form->create('ShadowAttribute', array('id' => 'accept_selected', 'url' => $baseurl . '/shadow_attributes/acceptSelected/' . $event['Event']['id']));
         echo $this->Form->input('ids_accept', array(
             'type' => 'text',
             'value' => '',
@@ -98,7 +98,7 @@
         echo $this->Form->end();
     ?>
         <?php
-        echo $this->Form->create('ShadowAttribute', array('id' => 'discard_selected', 'url' => '/shadow_attributes/discardSelected/' . $event['Event']['id']));
+        echo $this->Form->create('ShadowAttribute', array('id' => 'discard_selected', 'url' => $baseurl . '/shadow_attributes/discardSelected/' . $event['Event']['id']));
         echo $this->Form->input('ids_discard', array(
             'type' => 'text',
             'value' => '',
@@ -259,7 +259,7 @@ attributes or the appropriate distribution level. If you think there is a mistak
         </ul>
     </div>
 <script type="text/javascript">
-    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : '/events/viewEventAttributes/' . h($event['Event']['id']); ?>";
+    var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : $baseurl . '/events/viewEventAttributes/' . h($event['Event']['id']); ?>";
     var currentPopover = "";
     var ajaxResults = {"hover": [], "persistent": []};
     var timer;
diff --git a/app/View/Elements/eventattributecreation.ctp b/app/View/Elements/eventattributecreation.ctp
index 65ab2efbc..0284bd647 100644
--- a/app/View/Elements/eventattributecreation.ctp
+++ b/app/View/Elements/eventattributecreation.ctp
@@ -78,7 +78,7 @@
                                     )
                             ),
                             'class'=>'btn btn-primary',
-                            'url' => '/attributes/add/' . $event['Event']['id']
+                            'url' => $baseurl . '/attributes/add/' . $event['Event']['id']
                     ));
                     ?>
                 </td>
diff --git a/app/View/Elements/eventdiscussion.ctp b/app/View/Elements/eventdiscussion.ctp
index 1a8c25a0b..0d107bc3b 100644
--- a/app/View/Elements/eventdiscussion.ctp
+++ b/app/View/Elements/eventdiscussion.ctp
@@ -132,9 +132,8 @@
     <?php endif; ?>
     <div class="comment">
     <?php
-        if (isset($currentEvent)) $url = '/posts/add/event/' . $currentEvent;
-        else $url = '/posts/add/thread/' . $thread['Thread']['id'];
-        $url = h($url);
+        if (isset($currentEvent)) $url = $baseurl . '/posts/add/event/' . $currentEvent;
+        else $url = $baseurl . '/posts/add/thread/' . $thread['Thread']['id'];
         echo $this->Form->create('Post', array('url' => $url));
     ?>
         <fieldset>
diff --git a/app/View/Elements/genericElements/SideMenu/side_menu.ctp b/app/View/Elements/genericElements/SideMenu/side_menu.ctp
index 1f51a4628..a1b296f79 100644
--- a/app/View/Elements/genericElements/SideMenu/side_menu.ctp
+++ b/app/View/Elements/genericElements/SideMenu/side_menu.ctp
@@ -9,7 +9,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'dashboard':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'dashboardIndex',
-                        'url' => '/dashboards',
+                        'url' => $baseurl . '/dashboards',
                         'text' => __('View Dashboard')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -46,7 +46,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'dashboardTemplateIndex',
-                        'url' => '/dashboards/listTemplates',
+                        'url' => $baseurl . '/dashboards/listTemplates',
                         'text' => __('List Dashboard Templates')
                     ));
                     break;
@@ -61,7 +61,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if (($menuItem === 'template_populate_results')) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'template_populate_results',
-                            'url' => '/templates/index',
+                            'url' => $baseurl . '/templates/index',
                             'text' => __('Populate From Template')
                         ));
                     }
@@ -81,34 +81,34 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'viewEvent',
-                        'url' => '/events/view/' . $eventId,
+                        'url' => $baseurl . '/events/view/' . $eventId,
                         'text' => __('View Event')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'viewGraph',
-                        'url' => '/events/viewGraph/' . $eventId,
+                        'url' => $baseurl . '/events/viewGraph/' . $eventId,
                         'text' => __('View Correlation Graph')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'eventLog',
-                        'url' => '/logs/event_index/' . $eventId,
+                        'url' => $baseurl . '/logs/event_index/' . $eventId,
                         'text' => __('View Event History')
                     ));
                     echo $divider;
                     if ($isSiteAdmin || (isset($mayModify) && $mayModify)) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'editEvent',
-                            'url' => '/events/edit/' . $eventId,
+                            'url' => $baseurl . '/events/edit/' . $eventId,
                             'text' => __('Edit Event')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/events/delete/' . $eventId,
+                            'url' => $baseurl . '/events/delete/' . $eventId,
                             'text' => __('Delete Event'),
                             'message' => __('Are you sure you want to delete event #%s?', $eventId)
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addAttribute',
-                            'url' => '/attributes/add/' . $eventId,
+                            'url' => $baseurl . '/attributes/add/' . $eventId,
                             'text' => __('Add Attribute')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -121,7 +121,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addAttachment',
-                            'url' => '/attributes/add_attachment/' . $eventId,
+                            'url' => $baseurl . '/attributes/add_attachment/' . $eventId,
                             'text' => __('Add Attachment')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -133,7 +133,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                         if ($menuItem === 'populateFromtemplate') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                                'url' => '/templates/populateEventFromTemplate/' . $template_id . '/' . $eventId,
+                                'url' => $baseurl . '/templates/populateEventFromTemplate/' . $template_id . '/' . $eventId,
                                 'text' => __('Populate From Template')
                             ));
                         }
@@ -146,19 +146,19 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'merge',
-                            'url' => '/events/merge/' . $eventId,
+                            'url' => $baseurl . '/events/merge/' . $eventId,
                             'text' => __('Merge attributes from...')
                         ));
                     }
                     if (($isSiteAdmin && (!isset($mayModify) || !$mayModify)) || (!isset($mayModify) || !$mayModify)) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'proposeAttribute',
-                            'url' => '/shadow_attributes/add/' . $eventId,
+                            'url' => $baseurl . '/shadow_attributes/add/' . $eventId,
                             'text' => __('Propose Attribute')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'proposeAttachment',
-                            'url' => '/shadow_attributes/add_attachment/' . $eventId,
+                            'url' => $baseurl . '/shadow_attributes/add_attachment/' . $eventId,
                             'text' => __('Propose Attachment')
                         ));
                     }
@@ -232,7 +232,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     }
                     if ($isAclZmq && Configure::read('Plugin.ZeroMQ_enable')) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/events/pushEventToZMQ/' . $eventId,
+                            'url' => $baseurl . '/events/pushEventToZMQ/' . $eventId,
                             'text' => __('Publish event to ZMQ'),
                             'message' => __('Are you sure you wish to republish the current event to the ZMQ channel?')
                         ));
@@ -243,7 +243,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         Configure::read('Plugin.Kafka_event_notifications_topic')
                     ) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/events/pushEventToKafka/' . $eventId,
+                            'url' => $baseurl . '/events/pushEventToKafka/' . $eventId,
                             'text' => __('Publish event to Kafka'),
                             'message' => __('Are you sure you wish to republish the current event to the Kafka topic?')
                         ));
@@ -251,7 +251,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if (!empty($event['Orgc']['local'])) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'contact',
-                            'url' => '/events/contact/' . $eventId,
+                            'url' => $baseurl . '/events/contact/' . $eventId,
                             'text' => __('Contact Reporter')
                         ));
                     }
@@ -264,12 +264,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     ));
                     echo $divider;
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/events/index',
+                        'url' => $baseurl . '/events/index',
                         'text' => __('List Events')
                     ));
                     if ($isAclAdd) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/events/add',
+                            'url' => $baseurl . '/events/add',
                             'text' => __('Add Event')
                         ));
                     }
@@ -277,17 +277,17 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'tag-collections':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/tag_collections/index',
+                        'url' => $baseurl . '/tag_collections/index',
                         'text' => __('List Tag Collections')
                     ));
                     if ($isAclTagEditor) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/tag_collections/add',
+                            'url' => $baseurl . '/tag_collections/add',
                             'text' => __('Add Tag Collection')
                         ));
                         if (($menuItem === 'edit')) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                                'url' => '/tag_collections/edit/' . $id,
+                                'url' => $baseurl . '/tag_collections/edit/' . $id,
                                 'text' => __('Add Tag Collection')
                             ));
                         }
@@ -307,13 +307,13 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'event-collection':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'index',
-                        'url' => '/events/index',
+                        'url' => $baseurl . '/events/index',
                         'text' => __('List Events')
                     ));
                     if ($isAclAdd) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'add',
-                            'url' => '/events/add',
+                            'url' => $baseurl . '/events/add',
                             'text' => __('Add Event')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -325,19 +325,19 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'rest',
-                            'url' => '/servers/rest',
+                            'url' => $baseurl . '/servers/rest',
                             'text' => __('REST client')
                         ));
                     }
                     echo $divider;
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'listAttributes',
-                        'url' => '/attributes/index',
+                        'url' => $baseurl . '/attributes/index',
                         'text' => __('List Attributes')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'searchAttributes',
-                        'url' => '/attributes/search',
+                        'url' => $baseurl . '/attributes/search',
                         'text' => __('Search Attributes')
                     ));
                     if ($menuItem == 'searchAttributes2') {
@@ -353,28 +353,28 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     echo $divider;
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'viewProposals',
-                        'url' => '/shadow_attributes/index/all:0',
+                        'url' => $baseurl . '/shadow_attributes/index/all:0',
                         'text' => __('View Proposals')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'viewProposalIndex',
-                        'url' => '/events/proposalEventIndex',
+                        'url' => $baseurl . '/events/proposalEventIndex',
                         'text' => __('Events with proposals')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'viewDelegations',
-                        'url' => '/event_delegations/index/context:pending',
+                        'url' => $baseurl . '/event_delegations/index/context:pending',
                         'text' => __('View delegation requests')
                     ));
                     echo $divider;
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/events/export',
+                        'url' => $baseurl . '/events/export',
                         'text' => __('Export')
                     ));
                     if ($isAclAuth) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'automation',
-                            'url' => '/events/automation',
+                            'url' => $baseurl . '/events/automation',
                             'text' => __('Automation')
                         ));
                     }
@@ -383,18 +383,19 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'regexp':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'url' => sprintf(
-                            '%s/regexp/index',
+                            '%s%s/regexp/index',
+                            $baseurl,
                             $isSiteAdmin ? '/admin' : ''
                         ),
                         'text' => __('List Regexp')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/admin/regexp/add',
+                            'url' => $baseurl . '/admin/regexp/add',
                             'text' => __('New Regexp')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/admin/regexp/clean',
+                            'url' => $baseurl . '/admin/regexp/clean',
                             'text' => __('Perform on existing'),
                             'message' => __('Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured.')
                         ));
@@ -402,11 +403,11 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($menuItem === 'edit') {
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/admin/regexp/edit/' . h($id),
+                            'url' => $baseurl . '/admin/regexp/edit/' . h($id),
                             'text' => __('Edit Regexp')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/admin/regexp/delete/' . h($id),
+                            'url' => $baseurl . '/admin/regexp/delete/' . h($id),
                             'text' => __('Delete Regexp'),
                             'message' => __('Are you sure you want to delete # %s?', h($id))
                         ));
@@ -421,13 +422,13 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/warninglists/index',
+                        'url' => $baseurl . '/warninglists/index',
                         'text' => __('List Warninglists')
                     ));
 
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/warninglists/update',
+                            'url' => $baseurl . '/warninglists/update',
                             'text' => __('Update Warninglists'),
                             'message' => __('Are you sure you want to update all warninglists?')
                         ));
@@ -442,11 +443,11 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'index',
-                        'url' => '/noticelists/index',
+                        'url' => $baseurl . '/noticelists/index',
                         'text' => __('List Noticelist')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                        'url' => '/noticelists/update',
+                        'url' => $baseurl . '/noticelists/update',
                         'text' => __('Update Noticelists'),
                         'message' => __('Do you wish to continue and update all noticelists?')
                     ));
@@ -455,25 +456,26 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'whitelist':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'url' => sprintf(
-                            '%s/whitelists/index',
+                            '%s%s/whitelists/index',
+                            $baseurl,
                             $isSiteAdmin ? '/admin' : ''
                         ),
                         'text' => __('List Whitelist')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/admin/whitelists/add',
+                            'url' => $baseurl . '/admin/whitelists/add',
                             'text' => __('New Whitelist')
                         ));
                     }
                     if ($menuItem == 'edit') {
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/admin/whitelists/edit' . h($id),
+                            'url' => $baseurl . '/admin/whitelists/edit' . h($id),
                             'text' => __('Edit Whitelist')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/admin/whitelists/delete/' . h($id),
+                            'url' => $baseurl . '/admin/whitelists/delete/' . h($id),
                             'text' => __('Delete Whitelist'),
                             'message' => __('Are you sure you want to delete # %s?', h($id))
                         ));
@@ -483,11 +485,11 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'globalActions':
                     if (((Configure::read('MISP.disableUserSelfManagement') && $isAdmin) || !Configure::read('MISP.disableUserSelfManagement')) && ($menuItem === 'edit' || $menuItem === 'view' || $menuItem === 'change_pw')) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/users/edit',
+                            'url' => $baseurl . '/users/edit',
                             'text' => __('Edit My Profile')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/users/change_pw',
+                            'url' => $baseurl . '/users/change_pw',
                             'text' => __('Change Password')
                         ));
                         echo $divider;
@@ -500,78 +502,78 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'view',
-                        'url' => '/users/view/me',
+                        'url' => $baseurl . '/users/view/me',
                         'text' => __('My Profile')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'user_settings_index_me',
-                        'url' => '/user_settings/index/user_id:me',
+                        'url' => $baseurl . '/user_settings/index/user_id:me',
                         'text' => __('My Settings')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'user_settings_set',
-                        'url' => '/user_settings/setSetting',
+                        'url' => $baseurl . '/user_settings/setSetting',
                         'text' => __('Set Setting')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/dashboards',
+                        'url' => $baseurl . '/dashboards',
                         'text' => __('Dashboard')
                     ));
                     if ($isAclSharingGroup || empty(Configure::read('Security.hide_organisation_index_from_users'))) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'indexOrg',
-                            'url' => '/organisations/index',
+                            'url' => $baseurl . '/organisations/index',
                             'text' => __('List Organisations')
                         ));
                     }
                     if ($menuItem === 'viewOrg') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'viewOrg',
-                            'url' => '/organisations/view/' . h($id),
+                            'url' => $baseurl . '/organisations/view/' . h($id),
                             'text' => __('View Organisation')
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'roles',
-                        'url' => '/roles/index',
+                        'url' => $baseurl . '/roles/index',
                         'text' => __('Role Permissions')
                     ));
                     if ($menuItem === 'editSG' || ($menuItem == 'viewSG' && $mayModify)) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'editSG',
-                            'url' => '/sharing_groups/edit/' . h($id),
+                            'url' => $baseurl . '/sharing_groups/edit/' . h($id),
                             'text' => __('Edit Sharing Group')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'viewSG',
-                            'url' => '/sharing_groups/view/' . h($id),
+                            'url' => $baseurl . '/sharing_groups/view/' . h($id),
                             'text' => __('View Sharing Group')
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'indexSG',
-                        'url' => '/sharing_groups/index',
+                        'url' => $baseurl . '/sharing_groups/index',
                         'text' => __('List Sharing Groups')
                     ));
                     if ($isAclSharingGroup) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addSG',
-                            'url' => '/sharing_groups/add',
+                            'url' => $baseurl . '/sharing_groups/add',
                             'text' => __('Add Sharing Group')
                         ));
                     }
                     echo $divider;
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'userGuide',
-                        'url' => '/pages/display/doc/general',
+                        'url' => $baseurl . '/pages/display/doc/general',
                         'text' => __('User Guide')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/users/terms',
+                        'url' => $baseurl . '/users/terms',
                         'text' => __('Terms & Conditions')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/users/statistics',
+                        'url' => $baseurl . '/users/statistics',
                         'text' => __('Statistics')
                     ));
                     break;
@@ -579,27 +581,29 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'sync':
                     if ($me['Role']['perm_sync']) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/servers/createSync',
+                            'url' => $baseurl . '/servers/createSync',
                             'text' => __('Create Sync Config')
                         ));
                     }
                     if ($menuItem === 'import' && ($me['Role']['perm_site_admin'])) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/servers/import',
+                            'url' => $baseurl . '/servers/import',
                             'text' => __('Import Server Settings')
                         ));
                     }
                     if ($menuItem === 'previewEvent' && ($isSiteAdmin || $hostOrg)) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'url' => sprintf(
-                                '/servers/previewIndex/%s',
+                                '%s/servers/previewIndex/%s',
+                                $baseurl,
                                 h($server['Server']['id'])
                             ),
                             'text' => __('Explore Remote Server')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'url' => sprintf(
-                                '/servers/previewEvent/%s/%s',
+                                '%s/servers/previewEvent/%s/%s',
+                                $baseurl,
                                 h($server['Server']['id']),
                                 h($event['Event']['id'])
                             ),
@@ -610,7 +614,8 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'event_id' => 'pull',
                             'url' => sprintf(
-                                '/servers/pull/%s/%s',
+                                '%s/servers/pull/%s/%s',
+                                $baseurl,
                                 h($server['Server']['id']),
                                 h($event['Event']['id'])
                             ),
@@ -622,7 +627,8 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'previewIndex',
                             'url' => sprintf(
-                                '/servers/previewIndex/%s',
+                                '%s/servers/previewIndex/%s',
+                                $baseurl,
                                 h($id)
                             ),
                             'text' => __('Explore Remote Server')
@@ -632,13 +638,14 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'edit',
-                            'url' => '/servers/edit/' . h($id),
+                            'url' => $baseurl . '/servers/edit/' . h($id),
                             'text' => __('Edit Server')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'event_id' => 'pull',
                             'url' => sprintf(
-                                '/servers/delete/%s',
+                                '%s/servers/delete/%s',
+                                $baseurl,
                                 $this->Form->value('Server.id')
                             ),
                             'text' => __('Delete'),
@@ -646,28 +653,28 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/servers/index',
+                        'url' => $baseurl . '/servers/index',
                         'text' => __('List Servers')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/servers/add',
+                            'url' => $baseurl . '/servers/add',
                             'text' => __('New Servers')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/communities/index',
+                            'url' => $baseurl . '/communities/index',
                             'text' => __('List Communities'),
                             'element_id' => 'list_communities'
                         ));
                         if ($menuItem === 'view_community' || $menuItem === 'request_community_access') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'text' => __('Request Access'),
-                                'url' => '/communities/requestAccess/' . h($community['uuid']),
+                                'url' => $baseurl . '/communities/requestAccess/' . h($community['uuid']),
                                 'element_id' => 'request_community_access'
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'text' => __('View community'),
-                                'url' => '/communities/view/' . h($community['uuid']),
+                                'url' => $baseurl . '/communities/view/' . h($community['uuid']),
                                 'element_id' => 'view_community'
 
                             ));
@@ -685,7 +692,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($menuItem === 'editUser' || $menuItem === 'viewUser') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'viewUser',
-                            'url' => '/admin/users/view/' . h($id),
+                            'url' => $baseurl . '/admin/users/view/' . h($id),
                             'text' => __('View User')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -697,12 +704,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'editUser',
-                            'url' => '/admin/users/edit/' . h($id),
+                            'url' => $baseurl . '/admin/users/edit/' . h($id),
                             'text' => __('Edit User')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'event_id' => 'deleteUser',
-                            'url' => '/admin/users/delete/' . h($id),
+                            'url' => $baseurl . '/admin/users/delete/' . h($id),
                             'text' => __('Delete User'),
                             'message' => __('Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead.', h($id))
                         ));
@@ -711,12 +718,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($isSiteAdmin && $menuItem === 'editRole') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'editRole',
-                            'url' => '/admin/roles/edit/' . h($id),
+                            'url' => $baseurl . '/admin/roles/edit/' . h($id),
                             'text' => __('Edit Role')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'event_id' => 'deleteRole',
-                            'url' => '/admin/roles/delete/' . h($id),
+                            'url' => $baseurl . '/admin/roles/delete/' . h($id),
                             'text' => __('Delete Role'),
                             'message' => __('Are you sure you want to delete # %s?', h($id))
                         ));
@@ -725,34 +732,34 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addUser',
-                            'url' => '/admin/users/add',
+                            'url' => $baseurl . '/admin/users/add',
                             'text' => __('Add User')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'indexUser',
-                            'url' => '/admin/users/index',
+                            'url' => $baseurl . '/admin/users/index',
                             'text' => __('List Users')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'registrations',
-                            'url' => '/users/registrations',
+                            'url' => $baseurl . '/users/registrations',
                             'text' => __('Pending registrations')
                         ));
                     }
                     if ($isAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'user_settings_index',
-                            'url' => '/user_settings/index/user_id:all',
+                            'url' => $baseurl . '/user_settings/index/user_id:all',
                             'text' => __('User settings')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'user_settings_set',
-                            'url' => '/user_settings/setSetting',
+                            'url' => $baseurl . '/user_settings/setSetting',
                             'text' => __('Set Setting')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'contact',
-                            'url' => '/admin/users/email',
+                            'url' => $baseurl . '/admin/users/email',
                             'text' => __('Contact Users')
                         ));
                     }
@@ -760,13 +767,13 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addOrg',
-                            'url' => '/admin/organisations/add',
+                            'url' => $baseurl . '/admin/organisations/add',
                             'text' => __('Add Organisation')
                         ));
                         if ($menuItem === 'editOrg' || $menuItem === 'viewOrg') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'editOrg',
-                                'url' => '/admin/organisations/edit/' . h($id),
+                                'url' => $baseurl . '/admin/organisations/edit/' . h($id),
                                 'text' => __('Edit Organisation')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@@ -779,86 +786,86 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'viewOrg',
-                                'url' => '/organisations/view/' . h($id),
+                                'url' => $baseurl . '/organisations/view/' . h($id),
                                 'text' => __('View Organisation')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                                'url' => '/admin/organisations/delete/' . h($id),
+                                'url' => $baseurl . '/admin/organisations/delete/' . h($id),
                                 'text' => __('Delete Organisation'),
                                 'message' => __('Are you sure you want to delete # %s?', h($id))
                             ));
                         }
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'indexOrg',
-                            'url' => '/organisations/index',
+                            'url' => $baseurl . '/organisations/index',
                             'text' => __('List Organisations')
                         ));
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'addRole',
-                            'url' => '/admin/roles/add',
+                            'url' => $baseurl . '/admin/roles/add',
                             'text' => __('Add Role')
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'indexRole',
-                        'url' => '/admin/roles/index',
+                        'url' => $baseurl . '/admin/roles/index',
                         'text' => __('List Roles')
                     ));
                     if ($isSiteAdmin) {
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/servers/serverSettings',
+                            'url' => $baseurl . '/servers/serverSettings',
                             'text' => __('Server Settings & Maintenance')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/inbox',
+                            'url' => $baseurl . '/inbox',
                             'text' => __('Inbox')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/servers/updateProgress',
+                            'url' => $baseurl . '/servers/updateProgress',
                             'text' => __('Update Progress')
                         ));
                         echo $divider;
                         if (Configure::read('MISP.background_jobs')) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'jobs',
-                                'url' => '/jobs/index',
+                                'url' => $baseurl . '/jobs/index',
                                 'text' => __('Jobs')
                             ));
                             echo $divider;
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'tasks',
-                                'url' => '/tasks',
+                                'url' => $baseurl . '/tasks',
                                 'text' => __('Scheduled Tasks')
                             ));
                         }
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'eventBlockRule',
-                            'url' => '/servers/eventBlockRule',
+                            'url' => $baseurl . '/servers/eventBlockRule',
                             'text' => __('Event Block Rules')
                         ));
                         if (Configure::read('MISP.enableEventBlacklisting') !== false) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'eventBlacklistsAdd',
-                                'url' => '/eventBlacklists/add',
+                                'url' => $baseurl . '/eventBlacklists/add',
                                 'text' => __('Blacklists Event')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'eventBlacklists',
-                                'url' => '/eventBlacklists',
+                                'url' => $baseurl . '/eventBlacklists',
                                 'text' => __('Manage Event Blacklists')
                             ));
                         }
                         if (!Configure::check('MISP.enableOrgBlacklisting') || Configure::read('MISP.enableOrgBlacklisting') !== false) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'orgBlacklistsAdd',
-                                'url' => '/orgBlacklists/add',
+                                'url' => $baseurl . '/orgBlacklists/add',
                                 'text' => __('Blacklists Organisation')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'orgBlacklists',
-                                'url' => '/orgBlacklists',
+                                'url' => $baseurl . '/orgBlacklists',
                                 'text' => __('Manage Org Blacklists')
                             ));
                         }
@@ -867,11 +874,11 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'logs':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/admin/logs/index',
+                        'url' => $baseurl . '/admin/logs/index',
                         'text' => __('List Logs')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/admin/logs/search',
+                        'url' => $baseurl . '/admin/logs/search',
                         'text' => __('Search Logs')
                     ));
                     break;
@@ -880,12 +887,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($menuItem === 'add' || $menuItem === 'view') {
                         if (!(empty($thread_id) && empty($target_type))) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                                'url' => '/threads/view/' . h($thread_id),
+                                'url' => $baseurl . '/threads/view/' . h($thread_id),
                                 'text' => __('View Thread')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'add_post',
-                                'url' => '/posts/add/thread/' . h($thread_id),
+                                'url' => $baseurl . '/posts/add/thread/' . h($thread_id),
                                 'text' => __('Add Post')
                             ));
                             echo $divider;
@@ -894,22 +901,22 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($menuItem === 'edit') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'view',
-                            'url' => '/threads/view/' . h($thread_id),
+                            'url' => $baseurl . '/threads/view/' . h($thread_id),
                             'text' => __('View Thread')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'edit',
-                            'url' => '/threads/view/' . h($id),
+                            'url' => $baseurl . '/threads/view/' . h($id),
                             'text' => __('Edit Post')
                         ));
                         echo $divider;
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/threads/index',
+                        'url' => $baseurl . '/threads/index',
                         'text' => __('List Threads')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/posts/add',
+                        'url' => $baseurl . '/posts/add',
                         'text' => __('New Thread')
                     ));
                     break;
@@ -917,16 +924,16 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                 case 'tags':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'indexfav',
-                        'url' => '/tags/index/1',
+                        'url' => $baseurl . '/tags/index/1',
                         'text' => __('List Favourite Tags')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/tags/index',
+                        'url' => $baseurl . '/tags/index',
                         'text' => __('List Tags')
                     ));
                     if ($isAclTagEditor) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/tags/add',
+                            'url' => $baseurl . '/tags/add',
                             'text' => __('Add Tag')
                         ));
                     }
@@ -940,13 +947,13 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         if (!empty($taxonomy)) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'taxonomyview',
-                                'url' => '/taxonomies/view/' . h($taxonomy['Taxonomy']['id']),
+                                'url' => $baseurl . '/taxonomies/view/' . h($taxonomy['Taxonomy']['id']),
                                 'text' => __('View Taxonomy')
                             ));
                         }
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'viewGraph',
-                            'url' => '/tags/viewGraph/' . h($id),
+                            'url' => $baseurl . '/tags/viewGraph/' . h($id),
                             'text' => __('View Correlation Graph')
                         ));
                     }
@@ -954,7 +961,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'taxonomies':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/taxonomies/index',
+                        'url' => $baseurl . '/taxonomies/index',
                         'text' => __('List Taxonomies')
                     ));
                     if ($menuItem === 'view') {
@@ -974,7 +981,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'event_id' => 'update',
-                            'url' => '/taxonomies/update',
+                            'url' => $baseurl . '/taxonomies/update',
                             'text' => __('Update Taxonomies')
                         ));
                     }
@@ -982,25 +989,25 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'templates':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/templates/index',
+                        'url' => $baseurl . '/templates/index',
                         'text' => __('List Templates')
                     ));
                     if ($isSiteAdmin || $isAclTemplate) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/templates/add',
+                            'url' => $baseurl . '/templates/add',
                             'text' => __('Add Template')
                         ));
                     }
                     if (($menuItem === 'view' || $menuItem === 'edit')) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'view',
-                            'url' => '/templates/view/' . h($id),
+                            'url' => $baseurl . '/templates/view/' . h($id),
                             'text' => __('View Template')
                         ));
                         if ($mayModify) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'edit',
-                                'url' => '/templates/edit/' . h($id),
+                                'url' => $baseurl . '/templates/edit/' . h($id),
                                 'text' => __('Edit Template')
                             ));
                         }
@@ -1011,44 +1018,44 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         if ($isSiteAdmin && ($menuItem === 'view' || $menuItem === 'index')) {
                             echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                                 'event_id' => 'update',
-                                'url' => '/decayingModel/update',
+                                'url' => $baseurl . '/decayingModel/update',
                                 'text' => __('Update Default Models')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                                 'event_id' => 'update',
-                                'url' => '/decayingModel/update/true',
+                                'url' => $baseurl . '/decayingModel/update/true',
                                 'text' => __('Force Update Default Models')
                             ));
                         }
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/decayingModel/import',
+                            'url' => $baseurl . '/decayingModel/import',
                             'text' => __('Import Decaying Model')
                         ));
                         echo $divider;
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/decayingModel/add',
+                            'url' => $baseurl . '/decayingModel/add',
                             'text' => __('Add Decaying Model')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/decayingModel/decayingTool',
+                            'url' => $baseurl . '/decayingModel/decayingTool',
                             'text' => __('Decaying Models Tool')
                         ));
                         echo $divider;
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/decayingModel/index',
+                        'url' => $baseurl . '/decayingModel/index',
                         'text' => __('List Decaying Models')
                     ));
                     if (($menuItem === 'view' || $menuItem === 'edit')) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'view',
-                            'url' => '/decayingModel/view/' . h($id),
+                            'url' => $baseurl . '/decayingModel/view/' . h($id),
                             'text' => __('View Decaying Model')
                         ));
                         if ($isSiteAdmin) {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'edit',
-                                'url' => '/decayingModel/edit/' . h($id),
+                                'url' => $baseurl . '/decayingModel/edit/' . h($id),
                                 'text' => __('Edit Decaying Model')
                             ));
                         }
@@ -1057,32 +1064,32 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'feeds':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/feeds/index',
+                        'url' => $baseurl . '/feeds/index',
                         'text' => __('List Feeds')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/feeds/searchCaches',
+                        'url' => $baseurl . '/feeds/searchCaches',
                         'text' => __('Search Feed Caches')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/feeds/add',
+                            'url' => $baseurl . '/feeds/add',
                             'text' => __('Add Feed')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'import',
-                            'url' => '/feeds/importFeeds',
+                            'url' => $baseurl . '/feeds/importFeeds',
                             'text' => __('Import Feeds from JSON')
                         ));
                     }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'compare',
-                        'url' => '/feeds/compareFeeds',
+                        'url' => $baseurl . '/feeds/compareFeeds',
                         'text' => __('Feed overlap analysis matrix')
                     ));
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'export',
-                        'url' => '/feeds/index.json',
+                        'url' => $baseurl . '/feeds/index.json',
                         'text' => __('Export Feed settings'),
                         'download' => 'feed_index.json'
                     ));
@@ -1090,29 +1097,30 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                         if ($menuItem === 'edit' || $menuItem === 'view') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'edit',
-                                'url' => '/feeds/edit/' . h($feed['Feed']['id']),
+                                'url' => $baseurl . '/feeds/edit/' . h($feed['Feed']['id']),
                                 'text' => __('Edit Feed')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'view',
-                                'url' => '/feeds/view/' . h($feed['Feed']['id']),
+                                'url' => $baseurl . '/feeds/view/' . h($feed['Feed']['id']),
                                 'text' => __('View Feed')
                             ));
                         } else if ($menuItem === 'previewIndex') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'previewIndex',
-                                'url' => '/feeds/previewIndex/' . h($feed['Feed']['id']),
+                                'url' => $baseurl . '/feeds/previewIndex/' . h($feed['Feed']['id']),
                                 'text' => __('PreviewIndex')
                             ));
                         } else if ($menuItem === 'previewEvent') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'previewEvent',
-                                'url' => '/feeds/previewEvent/' . h($feed['Feed']['id']) . '/' . h($id),
+                                'url' => $baseurl . '/feeds/previewEvent/' . h($feed['Feed']['id']) . '/' . h($id),
                                 'text' => __('PreviewEvent')
                             ));
                             echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                                 'url' => sprintf(
-                                    '/feeds/getEvent/%s/%s',
+                                    '%s/feeds/getEvent/%s/%s',
+                                    $baseurl,
                                     h($feed['Feed']['id']),
                                     h($event['Event']['uuid'])
                                 ),
@@ -1125,12 +1133,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'news':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/news/index',
+                        'url' => $baseurl . '/news/index',
                         'text' => __('View News')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/news/add',
+                            'url' => $baseurl . '/news/add',
                             'text' => __('Add News Item')
                         ));
                         if ($menuItem === 'edit') {
@@ -1144,19 +1152,19 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'galaxies':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/galaxies/index',
+                        'url' => $baseurl . '/galaxies/index',
                         'text' => __('List Galaxies')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'element_id' => 'update',
-                            'url' => '/galaxies/update',
+                            'url' => $baseurl . '/galaxies/update',
                             'text' => __('Update Galaxies'),
                             'message' => __('Are you sure you want to reimport all galaxies from the submodule?')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
                             'element_id' => 'forceupdate',
-                            'url' => '/galaxies/update/force:1',
+                            'url' => $baseurl . '/galaxies/update/force:1',
                             'text' => __('Force Update Galaxies'),
                             'message' => __('Are you sure you want to drop and reimport all galaxies from the submodule?')
                         ));
@@ -1164,17 +1172,17 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
                     if ($menuItem === 'viewGraph' || $menuItem === 'view_cluster') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'view',
-                            'url' => '/galaxies/view/' . h($galaxy_id),
+                            'url' => $baseurl . '/galaxies/view/' . h($galaxy_id),
                             'text' => __('View Galaxy')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'view_cluster',
-                            'url' => '/galaxy_clusters/view/' . h($id),
+                            'url' => $baseurl . '/galaxy_clusters/view/' . h($id),
                             'text' => __('View Cluster')
                         ));
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'viewGraph',
-                            'url' => '/galaxies/viewGraph/' . h($id),
+                            'url' => $baseurl . '/galaxies/viewGraph/' . h($id),
                             'text' => __('View Correlation Graph')
                         ));
                     }
@@ -1188,12 +1196,12 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'objectTemplates':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/objectTemplates/index',
+                        'url' => $baseurl . '/objectTemplates/index',
                         'text' => __('List Object Templates')
                     ));
                     if ($isSiteAdmin) {
                         echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
-                            'url' => '/objectTemplates/update',
+                            'url' => $baseurl . '/objectTemplates/update',
                             'text' => __('Update Objects')
                         ));
                     }
@@ -1207,20 +1215,20 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
 
                 case 'sightingdb':
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                        'url' => '/sightingdb/add',
+                        'url' => $baseurl . '/sightingdb/add',
                         'text' => __('Add SightingDB connection')
                     ));
                     if ($isSiteAdmin) {
                         if ($menuItem === 'edit') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                                'url' => '/sightingdb/edit/' . $id,
+                                'url' => $baseurl . '/sightingdb/edit/' . $id,
                                 'element_id' => 'editSightingDB',
                                 'class' => 'active',
                                 'text' => __('Edit SightingDB connection')
                             ));
                         }
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                            'url' => '/sightingdb/index',
+                            'url' => $baseurl . '/sightingdb/index',
                             'text' => __('List SightingDB connections')
                         ));
                     }
diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index 5cfa1ebb5..f0effbd9a 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -12,35 +12,35 @@
                 'children' => array(
                     array(
                         'text' => __('List Events'),
-                        'url' => '/events/index'
+                        'url' => $baseurl . '/events/index'
                     ),
                     array(
                         'text' => __('Add Event'),
-                        'url' => '/events/add',
+                        'url' => $baseurl . '/events/add',
                         'requirement' => $isAclAdd
                     ),
                     array(
                         'text' => __('List Attributes'),
-                        'url' => '/attributes/index'
+                        'url' => $baseurl . '/attributes/index'
                     ),
                     array(
                         'text' => __('Search Attributes'),
-                        'url' => '/attributes/search'
+                        'url' => $baseurl . '/attributes/search'
                     ),
                     array(
                         'text' => __('REST client'),
-                        'url' => '/servers/rest'
+                        'url' => $baseurl . '/servers/rest'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('View Proposals'),
-                        'url' => '/shadow_attributes/index/all:0'
+                        'url' => $baseurl . '/shadow_attributes/index/all:0'
                     ),
                     array(
                         'text' => __('Events with proposals'),
-                        'url' => '/events/proposalEventIndex'
+                        'url' => $baseurl . '/events/proposalEventIndex'
                     ),
                     array(
                         'url' => '/event_delegations/index/context:pending',
@@ -51,28 +51,28 @@
                     ),
                     array(
                         'text' => __('List Tags'),
-                        'url' => '/tags/index'
+                        'url' => $baseurl . '/tags/index'
                     ),
                     array(
                         'text' => __('List Tag Collections'),
-                        'url' => '/tag_collections/index'
+                        'url' => $baseurl . '/tag_collections/index'
                     ),
                     array(
                         'text' => __('Add Tag'),
-                        'url' => '/tags/add',
+                        'url' => $baseurl . '/tags/add',
                         'requirement' => $isAclTagEditor
                     ),
                     array(
                         'text' => __('List Taxonomies'),
-                        'url' => '/taxonomies/index'
+                        'url' => $baseurl . '/taxonomies/index'
                     ),
                     array(
                         'text' => __('List Templates'),
-                        'url' => '/templates/index'
+                        'url' => $baseurl . '/templates/index'
                     ),
                     array(
                         'text' => __('Add Template'),
-                        'url' => '/templates/add',
+                        'url' => $baseurl . '/templates/add',
                         'requirement' => $isAclTemplate
                     ),
                     array(
@@ -80,11 +80,11 @@
                     ),
                     array(
                         'text' => __('Export'),
-                        'url' => '/events/export'
+                        'url' => $baseurl . '/events/export'
                     ),
                     array(
                         'text' => __('Automation'),
-                        'url' => '/events/automation',
+                        'url' => $baseurl . '/events/automation',
                         'requirement' => $isAclAuth
                     )
                 )
@@ -92,11 +92,11 @@
             array(
                 'type' => 'root',
                 'text' => __('Galaxies'),
-                'url' => '/galaxies/index',
+                'url' => $baseurl . '/galaxies/index',
                 'children' => array(
                     array(
                         'text' => __('List Galaxies'),
-                        'url' => '/galaxies/index'
+                        'url' => $baseurl . '/galaxies/index'
                     )
                 )
             ),
@@ -106,85 +106,85 @@
                 'children' => array(
                     array(
                         'text' => __('Import Regexp'),
-                        'url' => '/admin/regexp/index',
+                        'url' => $baseurl . '/admin/regexp/index',
                         'requirement' => $isAclRegexp
                     ),
                     array(
                         'text' => __('Import Regexp'),
-                        'url' => '/regexp/index',
+                        'url' => $baseurl . '/regexp/index',
                         'requirement' => !$isAclRegexp
                     ),
                     array(
                         'text' => __('Signature Whitelist'),
-                        'url' => '/admin/whitelists/index',
+                        'url' => $baseurl . '/admin/whitelists/index',
                         'requirement' => $isAclRegexp
                     ),
                     array(
                         'text' => __('Signature Whitelist'),
-                        'url' => '/whitelists/index',
+                        'url' => $baseurl . '/whitelists/index',
                         'requirement' => !$isAclRegexp
                     ),
                     array(
                         'text' => __('List Warninglists'),
-                        'url' => '/warninglists/index'
+                        'url' => $baseurl . '/warninglists/index'
                     ),
                     array(
                         'text' => __('List Noticelists'),
-                        'url' => '/noticelists/index'
+                        'url' => $baseurl . '/noticelists/index'
                     )
                 )
             ),
             array(
                 'type' => 'root',
                 'text' => __('Global Actions'),
-                'url' => '/dashboards',
+                'url' => $baseurl . '/dashboards',
                 'children' => array(
                     array(
                         'text' => __('News'),
-                        'url' => '/news'
+                        'url' => $baseurl . '/news'
                     ),
                     array(
                         'text' => __('My Profile'),
-                        'url' => '/users/view/me'
+                        'url' => $baseurl . '/users/view/me'
                     ),
                     array(
                         'text' => __('My Settings'),
-                        'url' => '/user_settings/index/user_id:me'
+                        'url' => $baseurl . '/user_settings/index/user_id:me'
                     ),
                     array(
                         'text' => __('Set Setting'),
-                        'url' => '/user_settings/setSetting'
+                        'url' => $baseurl . '/user_settings/setSetting'
                     ),
                     array(
                         'text' => __('Dashboard'),
-                        'url' => '/dashboards'
+                        'url' => $baseurl . '/dashboards'
                     ),
                     array(
                         'text' => __('Organisations'),
-                        'url' => '/organisations/index',
+                        'url' => $baseurl . '/organisations/index',
                         'requirement' => $isAclSharingGroup || empty(Configure::read('Security.hide_organisation_index_from_users'))
                     ),
                     array(
                         'text' => __('Role Permissions'),
-                        'url' => '/roles/index'
+                        'url' => $baseurl . '/roles/index'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('List Object Templates'),
-                        'url' => '/objectTemplates/index'
+                        'url' => $baseurl . '/objectTemplates/index'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('List Sharing Groups'),
-                        'url' => '/sharing_groups/index'
+                        'url' => $baseurl . '/sharing_groups/index'
                     ),
                     array(
                         'text' => __('Add Sharing Group'),
-                        'url' => '/sharing_groups/add',
+                        'url' => $baseurl . '/sharing_groups/add',
                         'requirement' => $isAclSharingGroup
                     ),
                     array(
@@ -192,42 +192,42 @@
                     ),
                     array(
                         'text' => __('Decaying Models Tool'),
-                        'url' => '/decayingModel/decayingTool',
+                        'url' => $baseurl . '/decayingModel/decayingTool',
                         'requirement' => $isAdmin
                     ),
                     array(
                         'text' => __('List Decaying Models'),
-                        'url' => '/decayingModel/index',
+                        'url' => $baseurl . '/decayingModel/index',
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('User Guide'),
-                        'url' => 'https://www.circl.lu/doc/misp/'
+                        'url' => $baseurl . 'https://www.circl.lu/doc/misp/'
                     ),
                     array(
                         'text' => __('Categories & Types'),
-                        'url' => '/pages/display/doc/categories_and_types'
+                        'url' => $baseurl . '/pages/display/doc/categories_and_types'
                     ),
                     array(
                         'text' => __('Terms & Conditions'),
-                        'url' => '/users/terms'
+                        'url' => $baseurl . '/users/terms'
                     ),
                     array(
                         'text' => __('Statistics'),
-                        'url' => '/users/statistics'
+                        'url' => $baseurl . '/users/statistics'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('List Discussions'),
-                        'url' => '/threads/index'
+                        'url' => $baseurl . '/threads/index'
                     ),
                     array(
                         'text' => __('Start Discussion'),
-                        'url' => '/posts/add'
+                        'url' => $baseurl . '/posts/add'
                     )
                 )
             ),
@@ -238,42 +238,42 @@
                 'children' => array(
                     array(
                         'text' => __('Create Sync Config'),
-                        'url' => '/servers/createSync',
+                        'url' => $baseurl . '/servers/createSync',
                         'requirement' => ($isAclSync && !$isSiteAdmin)
                     ),
                     array(
                         'text' => __('Import Server Settings'),
-                        'url' => '/servers/import',
+                        'url' => $baseurl . '/servers/import',
                         'requirement' => ($isSiteAdmin)
                     ),
                     array(
                         'text' => __('List Servers'),
-                        'url' => '/servers/index',
+                        'url' => $baseurl . '/servers/index',
                         'requirement' => ($isAclSync || $isAdmin)
                     ),
                     array(
                         'text' => __('List Feeds'),
-                        'url' => '/feeds/index',
+                        'url' => $baseurl . '/feeds/index',
                         'requirement' => ($isSiteAdmin || $hostOrgUser)
                     ),
                     array(
                         'text' => __('Search Feed Caches'),
-                        'url' => '/feeds/searchCaches',
+                        'url' => $baseurl . '/feeds/searchCaches',
                         'requirement' => ($isSiteAdmin || $hostOrgUser)
                     ),
                     array(
                         'text' => __('List SightingDB Connections'),
-                        'url' => '/sightingdb/index',
+                        'url' => $baseurl . '/sightingdb/index',
                         'requirement' => ($isSiteAdmin)
                     ),
                     array(
                         'text' => __('Add SightingDB Connection'),
-                        'url' => '/sightingdb/add',
+                        'url' => $baseurl . '/sightingdb/add',
                         'requirement' => ($isSiteAdmin)
                     ),
                     array(
                         'text' => __('List Communities'),
-                        'url' => '/communities/index',
+                        'url' => $baseurl . '/communities/index',
                         'requirement' => ($isSiteAdmin)
                     )
                 )
@@ -281,54 +281,54 @@
             array(
                 'type' => 'root',
                 'text' => __('Administration'),
-                'url' => '/servers/serverSettings',
+                'url' => $baseurl . '/servers/serverSettings',
                 'requirement' =>  ($isAdmin),
                 'children' => array(
                     array(
                         'text' => __('List Users'),
-                        'url' => '/admin/users/index'
+                        'url' => $baseurl . '/admin/users/index'
                     ),
                     array(
                         'text' => __('List User Settings'),
-                        'url' => '/user_settings/index/user_id:all'
+                        'url' => $baseurl . '/user_settings/index/user_id:all'
                     ),
                     array(
                         'text' => __('Set User Setting'),
-                        'url' => '/user_settings/setSetting'
+                        'url' => $baseurl . '/user_settings/setSetting'
                     ),
                     array(
                         'text' => __('Add User'),
-                        'url' => '/admin/users/add'
+                        'url' => $baseurl . '/admin/users/add'
                     ),
                     array(
                         'text' => __('Contact Users'),
-                        'url' => '/admin/users/email'
+                        'url' => $baseurl . '/admin/users/email'
                     ),
                     array(
                         'text' => __('User Registrations'),
-                        'url' => '/users/registrations'
+                        'url' => $baseurl . '/users/registrations'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('List Organisations'),
-                        'url' => '/organisations/index'
+                        'url' => $baseurl . '/organisations/index'
                     ),
                     array(
                         'text' => __('Add Organisations'),
-                        'url' => '/admin/organisations/add'
+                        'url' => $baseurl . '/admin/organisations/add'
                     ),
                     array(
                         'type' => 'separator'
                     ),
                     array(
                         'text' => __('List Roles'),
-                        'url' => '/admin/roles/index'
+                        'url' => $baseurl . '/admin/roles/index'
                     ),
                     array(
                         'text' => __('Add Roles'),
-                        'url' => '/admin/roles/add',
+                        'url' => $baseurl . '/admin/roles/add',
                         'requirement' => $isSiteAdmin
                     ),
                     array(
@@ -336,7 +336,7 @@
                     ),
                     array(
                         'text' => __('Server Settings & Maintenance'),
-                        'url' => '/servers/serverSettings',
+                        'url' => $baseurl . '/servers/serverSettings',
                         'requirement' => $isSiteAdmin
                     ),
                     array(
@@ -345,7 +345,7 @@
                     ),
                     array(
                         'text' => __('Jobs'),
-                        'url' => '/jobs/index',
+                        'url' => $baseurl . '/jobs/index',
                         'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
                     ),
                     array(
@@ -354,12 +354,12 @@
                     ),
                     array(
                         'text' => __('Scheduled Tasks'),
-                        'url' => '/tasks',
+                        'url' => $baseurl . '/tasks',
                         'requirement' => Configure::read('MISP.background_jobs') && $isSiteAdmin
                     ),
                     array(
                         'text' => __('Event Block Rules'),
-                        'url' => '/servers/eventBlockRule',
+                        'url' => $baseurl . '/servers/eventBlockRule',
                         'requirement' => $isSiteAdmin
                     ),
                     array(
@@ -368,12 +368,12 @@
                     ),
                     array(
                         'text' => __('Blacklist Event'),
-                        'url' => '/eventBlacklists/add',
+                        'url' => $baseurl . '/eventBlacklists/add',
                         'requirement' => Configure::read('MISP.enableEventBlacklisting') !== false && $isSiteAdmin
                     ),
                     array(
                         'text' => __('Manage Event Blacklists'),
-                        'url' => '/eventBlacklists',
+                        'url' => $baseurl . '/eventBlacklists',
                         'requirement' => Configure::read('MISP.enableEventBlacklisting') !== false && $isSiteAdmin
                     ),
                     array(
@@ -382,12 +382,12 @@
                     ),
                     array(
                         'text' => __('Blacklist Organisation'),
-                        'url' => '/orgBlacklists/add',
+                        'url' => $baseurl . '/orgBlacklists/add',
                         'requirement' => Configure::read('MISP.enableOrgBlacklisting') !== false && $isSiteAdmin
                     ),
                     array(
                         'text' => __('Manage Org Blacklists'),
-                        'url' => '/orgBlacklists',
+                        'url' => $baseurl . '/orgBlacklists',
                         'requirement' => Configure::read('MISP.enableOrgBlacklisting') !== false && $isSiteAdmin
                     ),
                 )
@@ -399,11 +399,11 @@
                 'children' => array(
                     array(
                         'text' => __('List Logs'),
-                        'url' => '/admin/logs/index'
+                        'url' => $baseurl . '/admin/logs/index'
                     ),
                     array(
                         'text' => __('Search Logs'),
-                        'url' => '/admin/logs/search'
+                        'url' => $baseurl . '/admin/logs/search'
                     )
                 )
             )
@@ -425,7 +425,7 @@
             ),
             array(
                 'type' => 'root',
-                'url' => '/dashboards',
+                'url' => $baseurl . '/dashboards',
                 'html' => sprintf(
                     '<span class="white" title="%s">%s%s&nbsp;&nbsp;&nbsp;%s</span>',
                     h($me['email']),
@@ -438,7 +438,7 @@
                 )
             ),
             array(
-                'url' => '/users/logout',
+                'url' => $baseurl . '/users/logout',
                 'text' => __('Log out'),
                 'requirement' => empty(Configure::read('Plugin.CustomAuth_disable_logout'))
             )
diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index cdf6eca20..e5de2d3a0 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -479,7 +479,7 @@
                 $clone.find('strong').text('Synchronization result:');
                 if (job_sent) {
                     $clone.find('#submoduleGitResult')
-                        .html('> Synchronizing DB with <a href="/jobs/index/" target="_blank">workers</a>...');
+			    .html('> Synchronizing DB with <a href="<?php echo $baseurl . '/jobs/index/'; ?>" target="_blank">workers</a>...');
                 } else {
                     $clone.find('#submoduleGitResult')
                         .text(sync_result);
diff --git a/app/View/Elements/healthElements/files.ctp b/app/View/Elements/healthElements/files.ctp
index 58bbc9861..0221d8124 100644
--- a/app/View/Elements/healthElements/files.ctp
+++ b/app/View/Elements/healthElements/files.ctp
@@ -79,7 +79,7 @@
                 ?>
             </table>
     <?php
-            echo $this->Form->create('Server', array('type' => 'file', 'url' => '/servers/uploadFile/' . $k));?>
+            echo $this->Form->create('Server', array('type' => 'file', 'url' => $baseurl . '/servers/uploadFile/' . $k));?>
                 <fieldset>
                     <?php
                     echo $this->Form->hidden('event_id');
diff --git a/app/View/Elements/healthElements/tabs.ctp b/app/View/Elements/healthElements/tabs.ctp
index 6a4db6b4b..ed218bf4a 100644
--- a/app/View/Elements/healthElements/tabs.ctp
+++ b/app/View/Elements/healthElements/tabs.ctp
@@ -5,7 +5,7 @@
                 'children' => array(
                     array(
                         'text' => __('Overview'),
-                        'url' => '/servers/serverSettings/',
+                        'url' => $baseurl . '/servers/serverSettings/',
                         'active' => $active_tab === false
                     )
                 )
@@ -23,12 +23,12 @@
                     ($tab['severity'] == 0) ? ' <i class="fa fa-exclamation-triangle" title="' . __('This tab reports some potential critical misconfigurations.') . '"></i>' : ''
                 )
             ),
-            'url' => '/servers/serverSettings/' . h($k),
+            'url' => $baseurl . '/servers/serverSettings/' . h($k),
             'active' => $k == $active_tab
         );
     }
     $data['children'][0]['children'][] = array(
-        'url' => '/servers/serverSettings/diagnostics',
+        'url' => $baseurl . '/servers/serverSettings/diagnostics',
         'html' => sprintf(
             '%s%s',
             __('Diagnostics'),
@@ -41,12 +41,12 @@
     );
 
     $data['children'][0]['children'][] = array(
-        'url' => '/servers/serverSettings/files',
+        'url' => $baseurl . '/servers/serverSettings/files',
         'text' => __('Manage files'),
         'active' => $active_tab === 'files'
     );
     $data['children'][0]['children'][] = array(
-        'url' => '/servers/serverSettings/workers',
+        'url' => $baseurl . '/servers/serverSettings/workers',
         'title' => __('Workers'),
         'active' => 'workers' == $active_tab,
         'html' => sprintf(
@@ -61,7 +61,7 @@
         'requirement' => !empty($worker_array)
     );
     $data['children'][0]['children'][] = array(
-        'url' => '/servers/serverSettings/download',
+        'url' => $baseurl . '/servers/serverSettings/download',
         'title' => __('Download report'),
         'html' => '<i class="fa fa-download"></i>'
     );
diff --git a/app/View/Elements/healthElements/workers.ctp b/app/View/Elements/healthElements/workers.ctp
index 274d9fa92..dfafa80f1 100644
--- a/app/View/Elements/healthElements/workers.ctp
+++ b/app/View/Elements/healthElements/workers.ctp
@@ -103,7 +103,7 @@
             <td class="actions short" style="<?php echo $style; ?>">
 <?php
         if ($worker_array['controls']) {
-            echo $this->Form->postLink('', '/servers/stopWorker/' . h($worker['pid']), array('class' => 'fa fa-trash black' . $icon_modifier, 'title' => __('Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it.')));
+            echo $this->Form->postLink('', $baseurl . '/servers/stopWorker/' . h($worker['pid']), array('class' => 'fa fa-trash black' . $icon_modifier, 'title' => __('Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it.')));
         }
             ?>
             </td>
@@ -115,7 +115,7 @@
     </table>
     <?php
         if ($worker_array['controls']) {
-            echo $this->Form->create('Server', array('url' => '/servers/startWorker/' . h($type)));
+            echo $this->Form->create('Server', array('url' => $baseurl . '/servers/startWorker/' . h($type)));
             echo $this->Form->button(__('Start a worker'), array('class' => 'btn btn-inverse'));
             echo $this->Form->end();
         }
@@ -126,7 +126,7 @@
 
 <?php
 if ($worker_array['controls']) {
-    echo $this->Form->create('Server', array('url' => '/servers/restartDeadWorkers'));
+    echo $this->Form->create('Server', array('url' => $baseurl . '/servers/restartDeadWorkers'));
     echo $this->Form->button(__('Restart dead workers'), array('class' => 'btn btn-primary'));
     echo $this->Form->end();
 }
diff --git a/app/View/Elements/serverRuleElements/ajaxTags.ctp b/app/View/Elements/serverRuleElements/ajaxTags.ctp
index 1a3bb85f5..b339132da 100644
--- a/app/View/Elements/serverRuleElements/ajaxTags.ctp
+++ b/app/View/Elements/serverRuleElements/ajaxTags.ctp
@@ -12,7 +12,7 @@
                 <div style="padding-left:0px;padding-right:5px;float:left;">
                     <?php if ($isSiteAdmin): ?>
                         <?php
-                            echo $this->Form->create('Server', array('id' => 'removeTag_' . h($tag['Tag']['id']),  'url' => '/servers/removeTag/' . h($server['Server']['id']) . '/' . h($tag['Tag']['id']), 'style' => 'margin:0px;'));
+                            echo $this->Form->create('Server', array('id' => 'removeTag_' . h($tag['Tag']['id']),  'url' => $baseurl . '/servers/removeTag/' . h($server['Server']['id']) . '/' . h($tag['Tag']['id']), 'style' => 'margin:0px;'));
                         ?>
                         <div title="<?php echo __('Remove tag');?>" role="button" tabindex="0" aria-label="<?php echo __('Remove tag');?>" class="tagSecondHalf useCursorPointer noPrint" onClick="removeServerTag('<?php echo h($server['Server']['id']); ?>', '<?php echo h($tag['Tag']['id']); ?>');">x</div>
                         <?php
diff --git a/app/View/Elements/templateElements/populateTemplateFile.ctp b/app/View/Elements/templateElements/populateTemplateFile.ctp
index 0388e3333..8e0e8f23a 100644
--- a/app/View/Elements/templateElements/populateTemplateFile.ctp
+++ b/app/View/Elements/templateElements/populateTemplateFile.ctp
@@ -16,7 +16,7 @@
         </div><br />
         <div class="input file" id="file_container_<?php echo $element_id;?>">
         </div>
-        <iframe id="iframe_<?php echo $element_id; ?>" src="/templates/uploadFile/<?php echo $element_id; ?>/<?php echo ($element['batch'] ? 'yes' : 'no'); ?>" style="border:0px;height:30px;width:100%;overflow:hidden;" scrolling="no"></iframe>
+	<iframe id="iframe_<?php echo $element_id; ?>" src="<?php echo $baseurl; ?>/templates/uploadFile/<?php echo $element_id; ?>/<?php echo ($element['batch'] ? 'yes' : 'no'); ?>" style="border:0px;height:30px;width:100%;overflow:hidden;" scrolling="no"></iframe>
         <div class="error-message populateTemplateErrorField" <?php if (!isset($errors[$element_id])) echo 'style="display:none;"';?>>
             <?php echo __('Error') . ': ' . $errors[$element_id]; ?>
         </div>
diff --git a/app/View/Elements/view_galaxy_matrix.ctp b/app/View/Elements/view_galaxy_matrix.ctp
index d3cb7baee..a42456459 100644
--- a/app/View/Elements/view_galaxy_matrix.ctp
+++ b/app/View/Elements/view_galaxy_matrix.ctp
@@ -95,7 +95,8 @@ foreach($tabs as $tabName => $column):
 <div class="hidden">
     <?php
         $url = sprintf(
-            '/galaxies/attachMultipleClusters/%s/%s/local:%s',
+            '%s/galaxies/attachMultipleClusters/%s/%s/local:%s',
+            $baseurl,
             empty($target_id) ? $eventId : $target_id,
             empty($target_type) ? 'event' : $target_type,
             empty($local) ? '0' : '1'
diff --git a/app/View/EventGraph/ajax/eventGraph_add_form.ctp b/app/View/EventGraph/ajax/eventGraph_add_form.ctp
index 6f46d85ea..09060a5c6 100644
--- a/app/View/EventGraph/ajax/eventGraph_add_form.ctp
+++ b/app/View/EventGraph/ajax/eventGraph_add_form.ctp
@@ -1,6 +1,6 @@
 <?php
     $url_params = $action == 'add' ? 'add/' . $event_id : 'edit/' . $eventGraph['id'];
-    echo $this->Form->create('EventGraph', array('url' => '/EventGraph/' . $url_params));
+    echo $this->Form->create('EventGraph', array('url' => $baseurl . '/EventGraph/' . $url_params));
 ?>
     <fieldset>
         <legend><?php echo $action == 'add' ? __('Add EventGraph') : __('Edit EventGraph'); ?></legend>
diff --git a/app/View/Events/ajax/eventDeleteConfirmationForm.ctp b/app/View/Events/ajax/eventDeleteConfirmationForm.ctp
index 10a286f8e..3c65d8fbc 100644
--- a/app/View/Events/ajax/eventDeleteConfirmationForm.ctp
+++ b/app/View/Events/ajax/eventDeleteConfirmationForm.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
 <?php
-    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/events/delete'));
+    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/events/delete'));
   echo $this->Form->hidden('id');
 ?>
 <legend><?php echo __('Event Deletion');?></legend>
diff --git a/app/View/Events/ajax/eventPublishConfirmationForm.ctp b/app/View/Events/ajax/eventPublishConfirmationForm.ctp
index 03489aafd..6da745041 100644
--- a/app/View/Events/ajax/eventPublishConfirmationForm.ctp
+++ b/app/View/Events/ajax/eventPublishConfirmationForm.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/events/' . $type . '/' . $id));
+    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/events/' . $type . '/' . $id));
     $extraTitle = "";
     if ($type == 'publish') $extraTitle = ' (no email)';
     $message = __('Publish Event%s', $extraTitle);
diff --git a/app/View/Events/ajax/quick_edit.ctp b/app/View/Events/ajax/quick_edit.ctp
index ca26f57ec..7f789614c 100644
--- a/app/View/Events/ajax/quick_edit.ctp
+++ b/app/View/Events/ajax/quick_edit.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Event', array('class' => 'inline-form inline-field-form', 'url' => '/events/quickEdit/' . $event['Event']['id'] . '/' . $field));
+    echo $this->Form->create('Event', array('class' => 'inline-form inline-field-form', 'url' => $baseurl . '/events/quickEdit/' . $event['Event']['id'] . '/' . $field));
 ?>
 <div class='inline-input inline-input-container'>
 <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" title="<?php echo __('Accept');?>" role="button" tabindex="0" aria-label="<?php echo __('Accept');?>"></span></div>
diff --git a/app/View/Events/ajax/toggle_correlation.ctp b/app/View/Events/ajax/toggle_correlation.ctp
index 4d3ecaea2..c2c7d3619 100644
--- a/app/View/Events/ajax/toggle_correlation.ctp
+++ b/app/View/Events/ajax/toggle_correlation.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/events/toggleCorrelation/' . $event['Event']['id']));
+    echo $this->Form->create('Event', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/events/toggleCorrelation/' . $event['Event']['id']));
     $extraTitle = "";
     ?>
     <legend><?php echo __('Toggle Correlation %s', $event['Event']['disable_correlation'] ? __('on') : __('off'));?></legend>
diff --git a/app/View/Events/automation.ctp b/app/View/Events/automation.ctp
index 2008ab821..5c04e0caa 100644
--- a/app/View/Events/automation.ctp
+++ b/app/View/Events/automation.ctp
@@ -2,9 +2,9 @@
     <h2><?php echo __('Automation');?></h2>
     <p><?php echo __('Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.
     To to make this functionality available for automated tools an authentication key is used.');?>
-    <br /><?php echo __('You can use the <a href="/servers/rest">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts.');?>
+    <br /><?php echo __('You can use the <a href="' . $baseurl . '/servers/rest">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts.');?>
     <strong><?php echo __('Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP.');?></strong>
-    <?php echo __('To view the old MISP automation page, click <a href="automation/1">here</a>.');?>
+    <?php echo __('To view the old MISP automation page, click <a href="' . $baseurl . '/automation/1">here</a>.');?>
     </p>
     <span>
         <?php
diff --git a/app/View/Events/export.ctp b/app/View/Events/export.ctp
index 14f8b373c..c47fc5129 100755
--- a/app/View/Events/export.ctp
+++ b/app/View/Events/export.ctp
@@ -175,7 +175,7 @@
 <script type="text/javascript">
     function generate(i, type, id, progress, modified) {
         $.ajax({
-            url: "/jobs/cache/" + type,
+                url: "<?php echo $baseurl; ?>/jobs/cache/" + type,
             })
             .done(function(data) {
                 jobsArray[i] = data;
@@ -186,7 +186,7 @@
         }
 
     function queryTask(type, i){
-        $.getJSON('/jobs/getProgress/cache_' + type, function(data) {
+        $.getJSON('<?php echo $baseurl; ?>/jobs/getProgress/cache_' + type, function(data) {
             var x = document.getElementById("bar" + i);
             x.style.width = data+"%";
             if (data > -1 && data < 100) {
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index 446babf54..522ae116f 100644
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -61,7 +61,7 @@
                         ),
                         array(
                             'requirement' => count($passedArgsArray) > 0,
-                            'url' => '/events/index',
+                            'url' => $baseurl . '/events/index',
                             'title' => __('Remove filters'),
                             'fa-icon' => 'times'
                         )
diff --git a/app/View/Events/resolved_attributes.ctp b/app/View/Events/resolved_attributes.ctp
index b6af00b10..87dfe7f67 100644
--- a/app/View/Events/resolved_attributes.ctp
+++ b/app/View/Events/resolved_attributes.ctp
@@ -19,7 +19,7 @@
                 $instanceDefault = Configure::read('MISP.default_attribute_distribution');
             }
         }
-        echo $this->Form->create('Attribute', array('url' => '/events/saveFreeText/' . $event['Event']['id'], 'class' => 'mainForm'));
+        echo $this->Form->create('Attribute', array('url' => $baseurl . '/events/saveFreeText/' . $event['Event']['id'], 'class' => 'mainForm'));
         if ($isSiteAdmin) {
             echo $this->Form->input('force', array(
                     'checked' => false,
diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index 18d26e1d8..797b3e911 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -2,7 +2,7 @@
     <h2><?php echo h($title); ?></h2>
     <?php
         $event_id = $event['Event']['id'];
-        $url = '/events/handleModuleResults/' . $event_id;
+        $url = $baseurl . '/events/handleModuleResults/' . $event_id;
         echo $this->Form->create('Event', array('url' => $url, 'class' => 'mainForm'));
         $formSettings = array(
             'type' => 'hidden',
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index cc35bd3f0..00d7d192f 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -250,7 +250,7 @@
         }
         $table_data[] = array(
             'key' => __('Sightings'),
-            'element' => '/Events/View/eventSightingValue',
+            'element' => $baseurl . '/Events/View/eventSightingValue',
             'element_params' => array(
                 'sightingPopover' => $sightingPopover,
                 'event' => $event,
@@ -563,20 +563,20 @@ $(document).ready(function () {
         delay: { show: 500, hide: 100 }
     });
 
-    $.get("/threads/view/<?php echo h($event['Event']['id']); ?>/true", function(data) {
+    $.get("<?php echo $baseurl; ?>/threads/view/<?php echo h($event['Event']['id']); ?>/true", function(data) {
         $("#discussions_div").html(data);
     });
 
 });
 
 function enable_correlation_graph() {
-    $.get("/events/viewGraph/<?php echo h($event['Event']['id']); ?>", function(data) {
+    $.get("<?php echo $baseurl; ?>/events/viewGraph/<?php echo h($event['Event']['id']); ?>", function(data) {
         $("#correlationgraph_div").html(data);
     });
 }
 
 function enable_attack_matrix() {
-    $.get("/events/viewGalaxyMatrix/<?php echo h($event['Event']['id']); ?>/<?php echo h($mitreAttackGalaxyId); ?>/event/1", function(data) {
+    $.get("<?php echo $baseurl; ?>/events/viewGalaxyMatrix/<?php echo h($event['Event']['id']); ?>/<?php echo h($mitreAttackGalaxyId); ?>/event/1", function(data) {
         $("#attackmatrix_div").html(data);
     });
 }
diff --git a/app/View/FavouriteTags/ajax/getToggleField.ctp b/app/View/FavouriteTags/ajax/getToggleField.ctp
index ba4f880d9..802d1457a 100644
--- a/app/View/FavouriteTags/ajax/getToggleField.ctp
+++ b/app/View/FavouriteTags/ajax/getToggleField.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('FavouriteTag', array('id' => 'FavouriteTagIndexForm', 'url' => '/favourite_tags/toggle'));
+    echo $this->Form->create('FavouriteTag', array('id' => 'FavouriteTagIndexForm', 'url' => $baseurl . '/favourite_tags/toggle'));
     echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
     echo $this->Form->end();
 ?>
diff --git a/app/View/Feeds/index.ctp b/app/View/Feeds/index.ctp
index a4c997843..5acf852b9 100644
--- a/app/View/Feeds/index.ctp
+++ b/app/View/Feeds/index.ctp
@@ -37,25 +37,25 @@
                     array(
                         'children' => array(
                             array(
-                                'url' => '/feeds/index/scope:default',
+                                'url' => $baseurl . '/feeds/index/scope:default',
                                 'text' => __('Default feeds'),
                                 'active' => $scope === 'default',
                                 'style' => 'display:inline;'
                             ),
                             array(
-                                'url' => '/feeds/index/scope:custom',
+                                'url' => $baseurl . '/feeds/index/scope:custom',
                                 'text' => __('Custom feeds'),
                                 'active' => $scope === 'custom',
                                 'style' => 'display:inline;'
                             ),
                             array(
-                                'url' => '/feeds/index/scope:all',
+                                'url' => $baseurl . '/feeds/index/scope:all',
                                 'text' => __('All feeds'),
                                 'active' => $scope === 'all',
                                 'style' => 'display:inline;'
                             ),
                             array(
-                                'url' => '/feeds/index/scope:enabled',
+                                'url' => $baseurl . '/feeds/index/scope:enabled',
                                 'text' => __('Enabled feeds'),
                                 'active' => $scope === 'enabled',
                                 'style' => 'display:inline;'
diff --git a/app/View/Feeds/preview_index.ctp b/app/View/Feeds/preview_index.ctp
index 723b49c07..4fd7c79e8 100644
--- a/app/View/Feeds/preview_index.ctp
+++ b/app/View/Feeds/preview_index.ctp
@@ -3,7 +3,7 @@
     <div class="pagination">
         <ul>
         <?php
-            $eventViewURL = '/feeds/previewEvent/' . h($id) . '/';
+            $eventViewURL = $baseurl . '/feeds/previewEvent/' . h($id) . '/';
             $this->Paginator->options(array(
                 'url' => $id,
                 'update' => '.span12',
@@ -69,7 +69,7 @@
             </td>
             <td ondblclick="document.location.href ='<?php echo $eventViewURL . h($uuid);?>'" class="short"><?php echo h($event['timestamp']); ?></td>
             <td class="short action-links">
-                <?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'fa fa-arrow-circle-down', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
+                <?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', $baseurl . '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'fa fa-arrow-circle-down', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
                 <a href='<?php echo $eventViewURL . h($uuid);?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
             </td>
         </tr>
diff --git a/app/View/Galaxies/view.ctp b/app/View/Galaxies/view.ctp
index ac6a8fece..3fe6e933d 100644
--- a/app/View/Galaxies/view.ctp
+++ b/app/View/Galaxies/view.ctp
@@ -32,7 +32,7 @@
 <script type="text/javascript">
 $(document).ready(function () {
     <?php
-        $uri = "/galaxy_clusters/index/" . $galaxy['Galaxy']['id'];
+        $uri = $baseurl . "/galaxy_clusters/index/" . $galaxy['Galaxy']['id'];
         if (isset($passedArgsArray)) {
             $uri .= '/searchall:' . $passedArgsArray['all'];
         }
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index 693ee8abe..299c71e1b 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -39,10 +39,10 @@
 </div>
 <script type="text/javascript">
 $(document).ready(function () {
-    $.get("/galaxy_elements/index/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
+    $.get("<?php echo $baseurl; ?>/galaxy_elements/index/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
         $("#elements_div").html(data);
     });
-    $.get("/galaxy_clusters/viewGalaxyMatrix/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
+    $.get("<?php echo $baseurl; ?>/galaxy_clusters/viewGalaxyMatrix/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
         $("#matrix_container").html(data);
     });
 });
diff --git a/app/View/Helper/OrgImgHelper.php b/app/View/Helper/OrgImgHelper.php
index ab061d68f..a24b1097c 100644
--- a/app/View/Helper/OrgImgHelper.php
+++ b/app/View/Helper/OrgImgHelper.php
@@ -18,7 +18,8 @@ App::uses('AppHelper', 'View/Helper');
             if (!empty($imgOptions)) {
                 foreach ($imgOptions as $field => $imgOption) {
                     $result = sprintf(
-                        '<img src="/img/orgs/%s" title="%s" width="%s" height="%s">',
+                        '<img src="%s/img/orgs/%s" title="%s" width="%s" height="%s">',
+                        $baseurl,
                         $imgOption,
                         isset($options['name']) ? h($options['name']) : h($options['id']),
                         (int)$size,
@@ -27,7 +28,8 @@ App::uses('AppHelper', 'View/Helper');
 
                     if (!$raw) {
                         $result = sprintf(
-                            '<a href="/organisations/view/%s">%s</a>',
+                            '<a href="%s/organisations/view/%s">%s</a>',
+                            $baseurl,
                             (empty($options['id']) ? h($options['name']) : h($options['id'])),
                             $result
                         );
@@ -42,7 +44,8 @@ App::uses('AppHelper', 'View/Helper');
                     );
                 } else {
                     $result = sprintf(
-                        '<a href="/organisations/view/%s"><span class="welcome">%s</span></a>',
+                        '<a href="%s/organisations/view/%s"><span class="welcome">%s</span></a>',
+                        $baseurl,
                         (empty($options['id']) ? h($options['name']) : h($options['id'])),
                         h($options['name'])
                     );
diff --git a/app/View/Jobs/index.ctp b/app/View/Jobs/index.ctp
index 3aaf1991c..f25c9662c 100644
--- a/app/View/Jobs/index.ctp
+++ b/app/View/Jobs/index.ctp
@@ -40,7 +40,7 @@
         function queueInterval(k, id) {
             intervalArray[k] = setInterval(function() {
                 if (tabIsActive) {
-                    $.getJSON('/jobs/getGenerateCorrelationProgress/' + id, function(data) {
+			$.getJSON('<?php echo $baseurl; ?>/jobs/getGenerateCorrelationProgress/' + id, function(data) {
                         var x = document.getElementById("bar" + id);
                         x.style.width = data+"%";
                         if (data > 0 && data < 100) {
@@ -61,25 +61,25 @@
                 array(
                     'children' => array(
                         array(
-                            'url' => '/jobs/index',
+                            'url' => $baseurl . '/jobs/index',
                             'text' => __('All'),
                             'title' => __('Show all queues'),
                             'active' => !$queue
                         ),
                         array(
-                            'url' => '/jobs/index/default',
+                            'url' => $baseurl . '/jobs/index/default',
                             'text' => __('Default'),
                             'title' => __('Show default queue'),
                             'active' => $queue === 'default'
                         ),
                         array(
-                            'url' => '/jobs/index/email',
+                            'url' => $baseurl . '/jobs/index/email',
                             'text' => __('Email'),
                             'titles' => __('Show email queue'),
                             'active' => $queue === 'email'
                         ),
                         array(
-                            'url' => '/jobs/index/cache',
+                            'url' => $baseurl . '/jobs/index/cache',
                             'text' => __('Cache'),
                             'title' => __('Show cache queue'),
                             'active' => $queue === 'cache'
@@ -147,7 +147,7 @@
                 echo h($item['Job']['job_status']);
                 if ($item['Job']['failed']):
             ?>
-                <div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="/jobs/getError" data-id="<?php echo h($item['Job']['process_id']); ?>"></div>
+		<div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="<?php echo $basurl; ?>/jobs/getError" data-id="<?php echo h($item['Job']['process_id']); ?>"></div>
             <?php
                 endif;
             ?>
diff --git a/app/View/Logs/admin_index.ctp b/app/View/Logs/admin_index.ctp
index 141fa55fd..047bda954 100644
--- a/app/View/Logs/admin_index.ctp
+++ b/app/View/Logs/admin_index.ctp
@@ -53,12 +53,12 @@
                 'text' => h($filterData['name']),
                 'title' => __('Modify filters'),
                 'active' => isset($filter) && $filterName === $filter,
-                'url' => '/admin/logs/index/filter:' . h($filterName)
+                'url' => $baseurl . '/admin/logs/index/filter:' . h($filterName)
             );
         }
         $data['children'][0]['children'][] = array(
             'requirement' => !empty($filter),
-            'url' => '/admin/logs/index',
+            'url' => $baseurl . '/admin/logs/index',
             'title' => __('Remove filters'),
             'fa-icon' => 'times'
         );
diff --git a/app/View/Noticelists/ajax/getToggleField.ctp b/app/View/Noticelists/ajax/getToggleField.ctp
index 4a54b36e8..6cca58543 100644
--- a/app/View/Noticelists/ajax/getToggleField.ctp
+++ b/app/View/Noticelists/ajax/getToggleField.ctp
@@ -1,4 +1,4 @@
 <?php
-echo $this->Form->create('Noticelist', array('id' => 'NoticelistIndexForm', 'url' => '/noticelists/toggleEnable'));
+echo $this->Form->create('Noticelist', array('id' => 'NoticelistIndexForm', 'url' => $baseurl . '/noticelists/toggleEnable'));
 echo $this->Form->input('data', array('id' => 'NoticelistData', 'label' => false, 'style' => 'display:none;'));
 echo $this->Form->end();
diff --git a/app/View/Noticelists/index.ctp b/app/View/Noticelists/index.ctp
index 0aa3495be..ff642f6ee 100644
--- a/app/View/Noticelists/index.ctp
+++ b/app/View/Noticelists/index.ctp
@@ -19,7 +19,7 @@
     <div id="hiddenFormDiv">
     <?php
         if ($isSiteAdmin) {
-            echo $this->Form->create('Noticelist', array('url' => '/noticelists/toggleEnable'));
+            echo $this->Form->create('Noticelist', array('url' => $baseurl . '/noticelists/toggleEnable'));
             echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
             echo $this->Form->end();
         }
diff --git a/app/View/ObjectReferences/ajax/add.ctp b/app/View/ObjectReferences/ajax/add.ctp
index 264fffbfc..6faa13cf2 100644
--- a/app/View/ObjectReferences/ajax/add.ctp
+++ b/app/View/ObjectReferences/ajax/add.ctp
@@ -1,5 +1,5 @@
 <div class="popover_choice">
-        <?php echo $this->Form->create('ObjectReference', array('url' => '/objectReferences/add/' . $objectId));?>
+        <?php echo $this->Form->create('ObjectReference', array('url' => $baseurl . '/objectReferences/add/' . $objectId));?>
         <fieldset>
             <legend><?php echo __('Add Object Reference'); ?></legend>
                 <div class="overlay_spacing">
diff --git a/app/View/ObjectReferences/ajax/delete.ctp b/app/View/ObjectReferences/ajax/delete.ctp
index 825883a17..e71b1e495 100644
--- a/app/View/ObjectReferences/ajax/delete.ctp
+++ b/app/View/ObjectReferences/ajax/delete.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
 <?php
-  $url = '/object_references/delete/' . $id;
+  $url = $baseurl . '/object_references/delete/' . $id;
   if ($hard) {
     $url .= '/true';
   }
diff --git a/app/View/ObjectTemplates/ajax/getToggleField.ctp b/app/View/ObjectTemplates/ajax/getToggleField.ctp
index b4aa6143d..cd49cd7ef 100644
--- a/app/View/ObjectTemplates/ajax/getToggleField.ctp
+++ b/app/View/ObjectTemplates/ajax/getToggleField.ctp
@@ -1,4 +1,4 @@
 <?php
-echo $this->Form->create('ObjectTemplate', array('url' => '/ObjectTemplates/activate', 'id' => 'ObjectTemplateIndexForm'));
+echo $this->Form->create('ObjectTemplate', array('url' => $baseurl . '/ObjectTemplates/activate', 'id' => 'ObjectTemplateIndexForm'));
 echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
 echo $this->Form->end();
diff --git a/app/View/ObjectTemplates/index.ctp b/app/View/ObjectTemplates/index.ctp
index 3c1f77a94..d420d096c 100644
--- a/app/View/ObjectTemplates/index.ctp
+++ b/app/View/ObjectTemplates/index.ctp
@@ -19,7 +19,7 @@
     <div id="hiddenFormDiv">
     <?php
         if ($isSiteAdmin) {
-            echo $this->Form->create('ObjectTemplate', array('url' => '/ObjectTemplates/activate'));
+            echo $this->Form->create('ObjectTemplate', array('url' => $baseurl . '/ObjectTemplates/activate'));
             echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
             echo $this->Form->end();
         }
@@ -31,12 +31,12 @@
                 array(
                     'children' => array(
                         array(
-                            'url' => '/objectTemplates/index',
+                            'url' => $baseurl . '/objectTemplates/index',
                             'text' => __('Enabled'),
                             'active' => !$all
                         ),
                         array(
-                            'url' => '/objectTemplates/index/all',
+                            'url' => $baseurl . '/objectTemplates/index/all',
                             'text' => __('All'),
                             'active' => $all
                         )
@@ -118,7 +118,7 @@ foreach ($list as $template):
             ?>
         </td>
         <td class="short action-links">
-            <a href='/objectTemplates/view/<?php echo $template['ObjectTemplate']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
+	    <a href='<?php echo $baseurl; ?>/objectTemplates/view/<?php echo $template['ObjectTemplate']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
             <?php
                 if ($isSiteAdmin):
                     echo $this->Form->postLink('', array('action' => 'update', $template['ObjectTemplate']['name'], 1), array('class' => 'fa fa-sync', 'title' => __('Force update')), __('Are you sure you want to force an update for template # %s?', $template['ObjectTemplate']['id']));
diff --git a/app/View/Objects/add.ctp b/app/View/Objects/add.ctp
index 37386c2e1..86f855c81 100644
--- a/app/View/Objects/add.ctp
+++ b/app/View/Objects/add.ctp
@@ -1,7 +1,7 @@
 <?php $update_template_available = isset($update_template_available) ? $update_template_available : false; ?>
 <div class="<?php if (!isset($ajax) || !$ajax) echo 'form';?>">
 <?php
-    $url = ($action == 'add') ? '/objects/revise_object/add/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] : '/objects/revise_object/edit/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] . '/' . h($object['Object']['id']);
+    $url = $baseurl . ($action == 'add') ? '/objects/revise_object/add/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] : '/objects/revise_object/edit/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] . '/' . h($object['Object']['id']);
     echo $this->Form->create('Object', array('id', 'url' => $url, 'enctype' => 'multipart/form-data'));
 ?>
 <h3><?php echo ucfirst($action) . ' ' . Inflector::humanize(h($template['ObjectTemplate']['name'])) . __(' Object'); ?></h3>
diff --git a/app/View/Objects/ajax/objectEditCommentForm.ctp b/app/View/Objects/ajax/objectEditCommentForm.ctp
index dbd5c74e4..499cbfc4a 100644
--- a/app/View/Objects/ajax/objectEditCommentForm.ctp
+++ b/app/View/Objects/ajax/objectEditCommentForm.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Object', array('class' => 'inline-form inline-field-form', 'id' => 'Object_' . $object['id'] . '_comment_form', 'url' => '/objects/editField/' . $object['id']));
+    echo $this->Form->create('Object', array('class' => 'inline-form inline-field-form', 'id' => 'Object_' . $object['id'] . '_comment_form', 'url' => $baseurl . '/objects/editField/' . $object['id']));
 ?>
     <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" role="button" tabindex="0" aria-label="<?php echo __('Accept change'); ?>"></span></div>
diff --git a/app/View/Objects/revise_object.ctp b/app/View/Objects/revise_object.ctp
index ac752007b..65f3d0228 100644
--- a/app/View/Objects/revise_object.ctp
+++ b/app/View/Objects/revise_object.ctp
@@ -2,7 +2,7 @@
   <h3><?php echo __('Object pre-save review');?></h3>
   <p><?php echo __('Make sure that the below Object reflects your expectation before submitting it.');?></p>
   <?php
-    $url = ($action == 'add') ? '/objects/add/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] : '/objects/edit/' . $object_id;
+    $url = $baseurl . ($action == 'add') ? '/objects/add/' . $event['Event']['id'] . '/' . $template['ObjectTemplate']['id'] : '/objects/edit/' . $object_id;
     echo $this->Form->create('Object', array('id', 'url' => $url));
     $formSettings = array(
       'type' => 'hidden',
diff --git a/app/View/Organisations/index.ctp b/app/View/Organisations/index.ctp
index 989966e5b..18fe831b8 100644
--- a/app/View/Organisations/index.ctp
+++ b/app/View/Organisations/index.ctp
@@ -56,17 +56,17 @@
                         array(
                             'text' => __('Local organisations'),
                             'active' => $scope === 'local',
-                            'url' => '/organisations/index/scope:local'
+                            'url' => $baseurl . '/organisations/index/scope:local'
                         ),
                         array(
                             'text' => __('Known remote organisations'),
                             'active' => $scope === 'external',
-                            'url' => '/organisations/index/scope:external'
+                            'url' => $baseurl . '/organisations/index/scope:external'
                         ),
                         array(
                             'text' => __('All organisations'),
                             'active' => $scope === 'all',
-                            'url' => '/organisations/index/scope:all'
+                            'url' => $baseurl . '/organisations/index/scope:all'
                         ),
                     )
                 ),
@@ -104,27 +104,27 @@
     <?php
 foreach ($orgs as $org): ?>
     <tr>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['id']); ?></td>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'">
+	<td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['id']); ?></td>
+        <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'">
             <?php
                 echo $this->OrgImg->getOrgImg(array('name' => $org['Organisation']['name'], 'id' => $org['Organisation']['id'], 'size' => 24));
             ?>
         </td>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['name']); ?></td>
+        <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['name']); ?></td>
         <?php if ($isSiteAdmin): ?>
-            <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['uuid']); ?></td>
+            <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['uuid']); ?></td>
         <?php endif; ?>
-        <td ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['description']); ?></td>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['nationality']); ?></td>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['sector']); ?></td>
-        <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['type']); ?></td>
+        <td ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['description']); ?></td>
+        <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['nationality']); ?></td>
+        <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['sector']); ?></td>
+        <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo h($org['Organisation']['type']); ?></td>
         <td><?php echo h($org['Organisation']['contacts']); ?></td>
         <?php if ($isSiteAdmin): ?>
-            <td class="short" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'">
+            <td class="short" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'">
                 <?php echo (isset($org['Organisation']['created_by_email'])) ? h($org['Organisation']['created_by_email']) : '&nbsp;'; ?>
             </td>
         <?php endif; ?>
-        <td class="short <?php echo $org['Organisation']['local'] ? 'green' : 'red';?>" ondblclick="document.location.href ='/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo $org['Organisation']['local'] ? __('Yes') : __('No');?></td>
+        <td class="short <?php echo $org['Organisation']['local'] ? 'green' : 'red';?>" ondblclick="document.location.href ='<?php echo $baseurl; ?>/organisations/view/<?php echo $org['Organisation']['id'];?>'"><?php echo $org['Organisation']['local'] ? __('Yes') : __('No');?></td>
         <td class="short"><?php echo isset($org['Organisation']['user_count']) ? $org['Organisation']['user_count'] : '0';?></td>
         <td class="short">
             <?php
@@ -135,12 +135,12 @@ foreach ($orgs as $org): ?>
         </td>
         <td class="short action-links">
             <?php if ($isSiteAdmin): ?>
-                <a href='/admin/organisations/edit/<?php echo $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('Edit');?>" aria-label = "<?php echo __('Edit');?>"></a>
+		<a href='<?php echo $baseurl . "/admin/organisations/edit/" . $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('Edit');?>" aria-label = "<?php echo __('Edit');?>"></a>
                 <?php
                     echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $org['Organisation']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete'), 'aria-label' => __('Delete')), __('Are you sure you want to delete %s?', $org['Organisation']['name']));
                 ?>
             <?php endif; ?>
-            <a href='/organisations/view/<?php echo $org['Organisation']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
+	    <a href='<?php echo $baseurl . "/organisations/view/" . $org['Organisation']['id']; ?>' class = "fa fa-eye" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
         </td>
     </tr>
     <?php
diff --git a/app/View/Servers/ajax/server_settings_edit.ctp b/app/View/Servers/ajax/server_settings_edit.ctp
index 468289338..882c868ee 100644
--- a/app/View/Servers/ajax/server_settings_edit.ctp
+++ b/app/View/Servers/ajax/server_settings_edit.ctp
@@ -1,5 +1,5 @@
 <?php
-    echo $this->Form->create('Server', array('class' => 'inline-form inline-field-form', 'url' => '/servers/serverSettingsEdit/' . $setting['setting'] . '/' . $id . '/' . '1', 'id' => 'setting_' . $subGroup . '_' . $id . '_form'));
+    echo $this->Form->create('Server', array('class' => 'inline-form inline-field-form', 'url' => $baseurl . '/servers/serverSettingsEdit/' . $setting['setting'] . '/' . $id . '/' . '1', 'id' => 'setting_' . $subGroup . '_' . $id . '_form'));
 ?>
     <div class='inline-input inline-input-container'>
     <div class="inline-input-accept inline-input-button inline-input-passive"><span class = "icon-ok" title="<?php echo __('Accept');?>" role="button" tabindex="0" aria-label="<?php echo __('Accept');?>"></span></div>
diff --git a/app/View/Servers/ajax/update.ctp b/app/View/Servers/ajax/update.ctp
index d319e463f..524c3a4ea 100644
--- a/app/View/Servers/ajax/update.ctp
+++ b/app/View/Servers/ajax/update.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-        echo $this->Form->create('Server', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/servers/update'));
+        echo $this->Form->create('Server', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/servers/update'));
     ?>
     <legend>Update MISP</legend>
     <div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
diff --git a/app/View/Servers/filter_event_index.ctp b/app/View/Servers/filter_event_index.ctp
index 3988595d3..4414b188a 100644
--- a/app/View/Servers/filter_event_index.ctp
+++ b/app/View/Servers/filter_event_index.ctp
@@ -1,5 +1,5 @@
 <div class="events">
-    <?php echo $this->Form->create('Event', array('id' => 'test', 'url' => '/events/index'));?>
+    <?php echo $this->Form->create('Event', array('id' => 'test', 'url' => $baseurl . '/events/index'));?>
     <fieldset>
         <legend><?php echo __('Filter Event Index');?></legend>
         <div class="overlay_spacing">
@@ -27,7 +27,7 @@
 
 <script type="text/javascript">
 var filterContext = "event";
-var actionUrl = "<?php echo '/servers/previewIndex/' . h($id); ?>"
+var actionUrl = "<?php echo $baseurl . '/servers/previewIndex/' . h($id); ?>"
 $(document).ready(function() {
     $('.datepicker').datepicker().on('changeDate', function(ev) {
         $('.dropdown-menu').hide();
diff --git a/app/View/Servers/index.ctp b/app/View/Servers/index.ctp
index 5d301a6aa..4e8a6b7de 100644
--- a/app/View/Servers/index.ctp
+++ b/app/View/Servers/index.ctp
@@ -158,12 +158,12 @@ foreach ($servers as $row_pos => $server):
         <td class="short"><span class="<?php echo ($server['Server']['unpublish_event'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['unpublish_event'] ? __('Yes') : __('No')); ?>"></span></td>
         <td class="short"><span class="<?php echo ($server['Server']['publish_without_email'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['publish_without_email'] ? __('Yes') : __('No')); ?>"></span></td>
         <td><?php echo h($server['Server']['url']); ?>&nbsp;</td>
-        <td><a href="/organisations/view/<?php echo h($server['RemoteOrg']['id']); ?>"><?php echo h($server['RemoteOrg']['name']); ?></a></td>
+	<td><a href="<?php echo $baseurl . "/organisations/view/" . h($server['RemoteOrg']['id']); ?>"><?php echo h($server['RemoteOrg']['name']); ?></a></td>
         <td class="short"><?php echo h($server['Server']['cert_file']); ?>&nbsp;</td>
         <td class="short"><?php echo h($server['Server']['client_cert_file']); ?>&nbsp;</td>
         <td class="short"><span class="<?php echo ($server['Server']['self_signed'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['self_signed'] ? __('Yes') : __('No')); ?>"></span></td>
         <td class="short"><span class="<?php echo ($server['Server']['skip_proxy'] ? 'icon-ok' : 'icon-remove'); ?>" role="img" aria-label="<?php echo ($server['Server']['skip_proxy'] ? __('Yes') : __('No')); ?>"></span></td>
-        <td class="short"><a href="/organisations/view/<?php echo h($server['Organisation']['id']); ?>"><?php echo h($server['Organisation']['name']); ?></a></td>
+	<td class="short"><a href="<?php echo $baseurl . "/organisations/view/" . h($server['Organisation']['id']); ?>"><?php echo h($server['Organisation']['name']); ?></a></td>
         <td class="short action-links">
             <?php
                 echo sprintf('<a href="%s" title="%s" aria-label="%s" class="%s"></a>', $baseurl . '/servers/previewIndex/' . h($server['Server']['id']), __('Explore'), __('Explore'), 'fa fa-search');
diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index f8203197c..6928a42cd 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -28,7 +28,7 @@
                     <dd class="eventTagContainer">
                     <?php if (!empty($event['Tag'])) foreach ($event['Tag'] as $tag): ?>
                         <span style="padding-right:0px;">
-                            <span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='/servers/previewIndex/<?php echo h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['name']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
+			    <span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['name']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
                         </span>
                     <?php endforeach; ?>&nbsp;
                     </dd>
diff --git a/app/View/Servers/preview_index.ctp b/app/View/Servers/preview_index.ctp
index 655159a01..b6f168bd2 100644
--- a/app/View/Servers/preview_index.ctp
+++ b/app/View/Servers/preview_index.ctp
@@ -4,7 +4,7 @@
     <div class="pagination">
         <ul>
         <?php
-            $eventViewURL = '/servers/previewEvent/' . h($id) . '/';
+            $eventViewURL = $baseurl . '/servers/previewEvent/' . h($id) . '/';
             $this->Paginator->options(array(
                 'url' => $id,
                 'update' => '.span12',
@@ -53,7 +53,7 @@
                         ),
                         array(
                             'requirement' => count($passedArgsArray) > 0,
-                            'url' => '/servers/previewIndex/' . h($server['Server']['id']),
+                            'url' => $baseurl . '/servers/previewIndex/' . h($server['Server']['id']),
                             'title' => __('Remove filters'),
                             'fa-icon' => 'times'
                         )
@@ -170,7 +170,7 @@
                 ?>
             </td>
             <td class="short action-links">
-                <?php if ($event['Event']['published']) echo $this->Form->postLink('', '/servers/pull/' . $server['Server']['id'] . '/' . $event['Event']['id'], array('class' => 'fa fa-arrow-circle-down', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Server.id'))); ?>
+                <?php if ($event['Event']['published']) echo $this->Form->postLink('', $baseurl . '/servers/pull/' . $server['Server']['id'] . '/' . $event['Event']['id'], array('class' => 'fa fa-arrow-circle-down', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Server.id'))); ?>
                 <a href='<?php echo $eventViewURL . h($event['Event']['id']);?>' class = "fa fa-eye" title = "<?php echo __('View');?>"></a>
             </td>
         </tr>
diff --git a/app/View/ShadowAttributes/index.ctp b/app/View/ShadowAttributes/index.ctp
index ef3db7a06..a24f355c1 100644
--- a/app/View/ShadowAttributes/index.ctp
+++ b/app/View/ShadowAttributes/index.ctp
@@ -11,12 +11,12 @@
                             array(
                                 'text' => __('My Org\'s Events'),
                                 'active' => !$all,
-                                'url' => '/shadow_attributes/index/all:0'
+                                'url' => $baseurl . '/shadow_attributes/index/all:0'
                             ),
                             array(
                                 'text' => __('All Events'),
                                 'active' => $all,
-                                'url' => '/shadow_attributes/index/all:1'
+                                'url' => $baseurl . '/shadow_attributes/index/all:1'
                             )
                         )
                     ),
diff --git a/app/View/SharingGroups/index.ctp b/app/View/SharingGroups/index.ctp
index 22d6d007b..494532cc6 100644
--- a/app/View/SharingGroups/index.ctp
+++ b/app/View/SharingGroups/index.ctp
@@ -22,12 +22,12 @@
                 array(
                     'children' => array(
                         array(
-                            'url' => '/sharing_groups/index',
+                            'url' => $baseurl . '/sharing_groups/index',
                             'text' => __('Active Sharing Groups'),
                             'active' => !$passive
                         ),
                         array(
-                            'url' => '/sharing_groups/index/true',
+                            'url' => $baseurl . '/sharing_groups/index/true',
                             'text' => __('Passive Sharing Groups'),
                             'active' => $passive
                         )
@@ -54,7 +54,7 @@ foreach ($sharingGroups as $k => $sharingGroup):
         <td class="short"><?php echo h($sharingGroup['SharingGroup']['id']); ?></td>
         <td class="short"><?php echo h($sharingGroup['SharingGroup']['uuid']); ?></td>
         <td class="short"><?php echo h($sharingGroup['SharingGroup']['name']); ?></td>
-        <td class="short"><a href="/organisations/view/<?php echo h($sharingGroup['Organisation']['id']);?>"><?php echo h($sharingGroup['Organisation']['name']); ?></a></td>
+	<td class="short"><a href="<?php echo $baseurl; ?>/organisations/view/<?php echo h($sharingGroup['Organisation']['id']);?>"><?php echo h($sharingGroup['Organisation']['name']); ?></a></td>
         <td><?php echo h($sharingGroup['SharingGroup']['description']); ?></td>
         <?php
             $combined = "";
@@ -62,7 +62,7 @@ foreach ($sharingGroups as $k => $sharingGroup):
             if (count($sharingGroup['SharingGroupOrg']) == 0) $combined .= "<br />N/A";
             foreach ($sharingGroup['SharingGroupOrg'] as $k2 => $sge) {
                 if (!empty($sge['Organisation'])) {
-                    $combined .= "<br /><a href='/Organisation/view/" . h($sge['Organisation']['id']) . "'>" . h($sge['Organisation']['name']) . "</a>";
+                    $combined .= "<br /><a href='" . $baseurl . "/Organisation/view/" . h($sge['Organisation']['id']) . "'>" . h($sge['Organisation']['name']) . "</a>";
                     if ($sge['extend']) $combined .= (' (can extend)');
                 }
             }
@@ -70,7 +70,7 @@ foreach ($sharingGroups as $k => $sharingGroup):
             if (count($sharingGroup['SharingGroupServer']) == 0) $combined .= "<br />N/A";
             foreach ($sharingGroup['SharingGroupServer'] as $k3 => $sgs) {
                 if ($sgs['server_id'] != 0) {
-                    $combined .= "<br /><a href='/Server/view/" . h($sgs['Server']['id']) . "'>" . h($sgs['Server']['name']) . "</a>";
+                    $combined .= "<br /><a href='" . $baseurl . "/Server/view/" . h($sgs['Server']['id']) . "'>" . h($sgs['Server']['name']) . "</a>";
                 } else {
                     $combined .= "<br />This instance";
                 }
@@ -88,7 +88,7 @@ foreach ($sharingGroups as $k => $sharingGroup):
             <?php echo $this->Html->link('', '/SharingGroups/edit/' . $sharingGroup['SharingGroup']['id'], array('class' => 'black fa fa-edit', 'title' => __('Edit'), 'aria-label' => __('Edit'))); ?>
             <?php echo $this->Form->postLink('', '/SharingGroups/delete/' . $sharingGroup['SharingGroup']['id'], array('class' => 'black fa fa-trash', 'title' => __('Delete'), 'aria-label' => __('Delete')), __('Are you sure you want to delete %s?', h($sharingGroup['SharingGroup']['name']))); ?>
         <?php endif; ?>
-            <a href="/sharing_groups/view/<?php echo $sharingGroup['SharingGroup']['id']; ?>" class="black fa fa-eye" title="<?php echo __('View');?>" aria-label="<?php echo __('View');?>"></a>
+	    <a href="<?php echo $baseurl; ?>/sharing_groups/view/<?php echo $sharingGroup['SharingGroup']['id']; ?>" class="black fa fa-eye" title="<?php echo __('View');?>" aria-label="<?php echo __('View');?>"></a>
         </td>
     </tr>
     <?php
diff --git a/app/View/SharingGroups/view.ctp b/app/View/SharingGroups/view.ctp
index 870c9d00e..9d0212f04 100644
--- a/app/View/SharingGroups/view.ctp
+++ b/app/View/SharingGroups/view.ctp
@@ -21,12 +21,12 @@
             endforeach;
         ?>
         <dt><?php echo __('Created by');?></dt>
-        <dd><a href="/organisations/view/<?php echo $sg['Organisation']['id']; ?>"><?php echo h($sg['Organisation']['name']); ?></a></dd>
+	<dd><a href="<?php echo $baseurl; ?>/organisations/view/<?php echo $sg['Organisation']['id']; ?>"><?php echo h($sg['Organisation']['name']); ?></a></dd>
         <?php
             if ($sg['SharingGroup']['sync_user_id']):
         ?>
             <dt><?php echo __('Synced by');?></dt>
-            <dd><a href="/organisations/view/<?php echo $sg['Organisation']['id']; ?>"><?php echo h($sg['Organisation']['name']); ?></a></dd>
+	    <dd><a href="<?php echo $baseurl; ?>/organisations/view/<?php echo $sg['Organisation']['id']; ?>"><?php echo h($sg['Organisation']['name']); ?></a></dd>
         <?php
             endif;
         ?>
@@ -47,7 +47,7 @@
                     foreach ($sg['SharingGroupOrg'] as $sgo):
                 ?>
                 <tr>
-                    <td><a href="/organisations/view/<?php echo h($sgo['Organisation']['id']); ?>"><?php echo h($sgo['Organisation']['name']); ?></a></td>
+		    <td><a href="<?php echo $baseurl; ?>/organisations/view/<?php echo h($sgo['Organisation']['id']); ?>"><?php echo h($sgo['Organisation']['name']); ?></a></td>
                     <td><span class="<?php echo ($sgo['Organisation']['local'] ? 'icon-ok' : 'icon-remove'); ?>"></span></td>
                     <td><span class="<?php echo ($sgo['extend'] ? 'icon-ok' : 'icon-remove'); ?>"></span></td>
                 </tr>
diff --git a/app/View/Sightings/ajax/add_sighting.ctp b/app/View/Sightings/ajax/add_sighting.ctp
index 203937145..3da2d9074 100644
--- a/app/View/Sightings/ajax/add_sighting.ctp
+++ b/app/View/Sightings/ajax/add_sighting.ctp
@@ -1,7 +1,7 @@
 <h3>Add Sighting</h3>
 <div id="sightingsEventId" class="hidden" data-event-id="<?php echo h($event_id); ?>"></div>
 <?php
-    echo $this->Form->create('Sighting', array('id', 'url' => '/sightings/add/' . urlencode(h($id)), 'style' => 'margin-bottom:0px;'));
+    echo $this->Form->create('Sighting', array('id', 'url' => $baseurl . '/sightings/add/' . urlencode(h($id)), 'style' => 'margin-bottom:0px;'));
     echo $this->Form->input('type', array(
             'options' => array('Sighting', 'False-positive', 'Expiration'),
             'default' => 0,
diff --git a/app/View/Sightings/ajax/advanced.ctp b/app/View/Sightings/ajax/advanced.ctp
index 5ec7e3dfa..ee7e57ed6 100644
--- a/app/View/Sightings/ajax/advanced.ctp
+++ b/app/View/Sightings/ajax/advanced.ctp
@@ -50,13 +50,13 @@ $('.sightingsToggle').click(function() {
     if (type == 'graph') {
         loadSightingGraph(id, object_context);
     } else if (type == 'add') {
-        $.get( "/sightings/add/" + id, function(data) {
+	    $.get("<?php echo $baseurl; ?>/sightings/add/" + id, function(data) {
             $("#sightingsData").html(data);
         });
     } else {
         var org = "";
         if (type == 'org') org = "/<?php echo h($me['org_id']);?>"
-        $.get( "/sightings/listSightings/" + id + "/" + object_context + org, function(data) {
+        $.get("<?php echo $baseurl; ?>/sightings/listSightings/" + id + "/" + object_context + org, function(data) {
             $("#sightingsData").html(data);
         });
     }
diff --git a/app/View/Sightings/ajax/like_button.ctp b/app/View/Sightings/ajax/like_button.ctp
index 4956e3ced..cb6480079 100644
--- a/app/View/Sightings/ajax/like_button.ctp
+++ b/app/View/Sightings/ajax/like_button.ctp
@@ -1,4 +1,4 @@
 <?php
-    echo $this->Form->create('Sighting', array('id' => 'Sighting_' . $id, 'url' => '/sightings/add/' . $id, 'style' => 'display:none;'));
+    echo $this->Form->create('Sighting', array('id' => 'Sighting_' . $id, 'url' => $baseurl . '/sightings/add/' . $id, 'style' => 'display:none;'));
     echo $this->Form->end();
 ?>
diff --git a/app/View/Sightings/ajax/quickAddConfirmationForm.ctp b/app/View/Sightings/ajax/quickAddConfirmationForm.ctp
index 403dae968..1bc98e933 100644
--- a/app/View/Sightings/ajax/quickAddConfirmationForm.ctp
+++ b/app/View/Sightings/ajax/quickAddConfirmationForm.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-        echo $this->Form->create('Sighting', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/sightings/add/' . $id));
+        echo $this->Form->create('Sighting', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/sightings/add/' . $id));
     ?>
     <legend><?php echo __('Add Sighting');?></legend>
     <div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
diff --git a/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp b/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp
index c90c8df38..c1d001d9f 100644
--- a/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp
+++ b/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
     <?php
-        echo $this->Form->create('Sighting', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/sightings/quickDelete/' . $id . '/' . urlencode($rawId) . '/' . $context));
+        echo $this->Form->create('Sighting', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/sightings/quickDelete/' . $id . '/' . urlencode($rawId) . '/' . $context));
     ?>
     <legend><?php echo __('Remove Sighting');?></legend>
     <div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp
index 4d84376b8..d483382ea 100644
--- a/app/View/Tags/index.ctp
+++ b/app/View/Tags/index.ctp
@@ -26,7 +26,7 @@
     </div>
     <div id="hiddenFormDiv">
     <?php
-        echo $this->Form->create('FavouriteTag', array('url' => '/favourite_tags/toggle'));
+        echo $this->Form->create('FavouriteTag', array('url' => $baseurl . '/favourite_tags/toggle'));
         echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
         echo $this->Form->end();
     ?>
diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp
index 0d54ce2dc..756321443 100644
--- a/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp
+++ b/app/View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
 <?php
-    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/taxonomies/addTag'));
+    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/taxonomies/addTag'));
 ?>
     <div class="hidden">
 <?php
diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp
index 692f3a0a4..0462adf3e 100644
--- a/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp
+++ b/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
 <?php
-    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/taxonomies/hideTag'));
+    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/taxonomies/hideTag'));
 ?>
 <div class="hidden">
 <?php
@@ -34,4 +34,4 @@
 <?php
     echo $this->Form->end();
 ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp
index 5391b7c98..8ab18583b 100644
--- a/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp
+++ b/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp
@@ -1,6 +1,6 @@
 <div class="confirmation">
 <?php
-    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/taxonomies/unhideTag'));
+    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/taxonomies/unhideTag'));
 ?>
 <div class="hidden">
 <?php
@@ -34,4 +34,4 @@
 <?php
     echo $this->Form->end();
 ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/View/Taxonomies/ajax/toggle_required.ctp b/app/View/Taxonomies/ajax/toggle_required.ctp
index c97b2bc0a..094072ab5 100644
--- a/app/View/Taxonomies/ajax/toggle_required.ctp
+++ b/app/View/Taxonomies/ajax/toggle_required.ctp
@@ -3,7 +3,7 @@
         'id' => 'RequiredCheckboxForm' . h($id),
         'label' => false,
         'style' => 'display:none;',
-        'url' => '/taxonomies/toggleRequired/' . $id
+        'url' => $baseurl . '/taxonomies/toggleRequired/' . $id
     ));
     echo $this->Form->checkbox('required', array(
         'checked' => $required,
diff --git a/app/View/Taxonomies/view.ctp b/app/View/Taxonomies/view.ctp
index 41914d6a0..2cc2adecf 100644
--- a/app/View/Taxonomies/view.ctp
+++ b/app/View/Taxonomies/view.ctp
@@ -150,12 +150,12 @@
                 <td class="action">
                     <?php
                         if ($isAclTagger && $taxonomy['enabled']) {
-                            echo $this->Form->create('Tag', array('id' => 'quick_' . h($k), 'url' => '/taxonomies/addTag/', 'style' => 'margin:0px;'));
+                            echo $this->Form->create('Tag', array('id' => 'quick_' . h($k), 'url' => $baseurl . '/taxonomies/addTag/', 'style' => 'margin:0px;'));
                             echo $this->Form->input('name', array('type' => 'hidden', 'value' => $item['tag']));
                             echo $this->Form->input('taxonomy_id', array('type' => 'hidden', 'value' => $taxonomy['id']));
                             echo $this->Form->end();
                             if ($item['existing_tag'] && !$item['existing_tag']['Tag']['hide_tag']):
-                                echo $this->Form->create('Tag', array('id' => 'quick_disable_' . h($k), 'url' => '/taxonomies/disableTag/', 'style' => 'margin:0px;'));
+                                echo $this->Form->create('Tag', array('id' => 'quick_disable_' . h($k), 'url' => $baseurl . '/taxonomies/disableTag/', 'style' => 'margin:0px;'));
                                 echo $this->Form->input('name', array('type' => 'hidden', 'value' => $item['tag']));
                                 echo $this->Form->input('taxonomy_id', array('type' => 'hidden', 'value' => $taxonomy['id']));
                                 echo $this->Form->end();
diff --git a/app/View/TemplateElements/ajax/template_element_add_attribute.ctp b/app/View/TemplateElements/ajax/template_element_add_attribute.ctp
index 0c5e59283..f67a484a4 100644
--- a/app/View/TemplateElements/ajax/template_element_add_attribute.ctp
+++ b/app/View/TemplateElements/ajax/template_element_add_attribute.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_attribute">
 <?php
-    echo $this->Form->create('TemplateElementAttribute', array('id', 'url' => '/templateElements/add/attribute/' . $id));
+    echo $this->Form->create('TemplateElementAttribute', array('id', 'url' => $baseurl . '/templateElements/add/attribute/' . $id));
 ?>
     <legend><?php echo __('Add Attribute Element To Template'); ?></legend>
     <fieldset>
diff --git a/app/View/TemplateElements/ajax/template_element_add_file.ctp b/app/View/TemplateElements/ajax/template_element_add_file.ctp
index 4eb566a44..90dc38e7d 100644
--- a/app/View/TemplateElements/ajax/template_element_add_file.ctp
+++ b/app/View/TemplateElements/ajax/template_element_add_file.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_file">
 <?php
-    echo $this->Form->create('TemplateElementFile', array('id', 'url' => '/templateElements/add/file/' . $id));
+    echo $this->Form->create('TemplateElementFile', array('id', 'url' => $baseurl . '/templateElements/add/file/' . $id));
 ?>
     <legend><?php echo __('Add File Element To Template'); ?></legend>
     <fieldset>
diff --git a/app/View/TemplateElements/ajax/template_element_add_text.ctp b/app/View/TemplateElements/ajax/template_element_add_text.ctp
index 43d596faf..2f991501e 100644
--- a/app/View/TemplateElements/ajax/template_element_add_text.ctp
+++ b/app/View/TemplateElements/ajax/template_element_add_text.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_text">
 <?php
-    echo $this->Form->create('TemplateElementText', array('url' => '/templateElements/add/text/' . $id));
+    echo $this->Form->create('TemplateElementText', array('url' => $baseurl . '/templateElements/add/text/' . $id));
 ?>
     <legend><?php echo __('Add Text Element To Template'); ?></legend>
     <fieldset>
diff --git a/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp b/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp
index 5aa9f24ef..7473ed897 100644
--- a/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp
+++ b/app/View/TemplateElements/ajax/template_element_edit_attribute.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_attribute">
 <?php
-    echo $this->Form->create('TemplateElementAttribute', array('id', 'url' => '/templateElements/edit/attribute/' . $id));
+    echo $this->Form->create('TemplateElementAttribute', array('id', 'url' => $baseurl . '/templateElements/edit/attribute/' . $id));
 ?>
     <legend><?php echo __('Edit Attribute Element'); ?></legend>
     <fieldset>
diff --git a/app/View/TemplateElements/ajax/template_element_edit_file.ctp b/app/View/TemplateElements/ajax/template_element_edit_file.ctp
index f8d0774d8..0fddb2f37 100644
--- a/app/View/TemplateElements/ajax/template_element_edit_file.ctp
+++ b/app/View/TemplateElements/ajax/template_element_edit_file.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_file">
 <?php
-    echo $this->Form->create('TemplateElementFile', array('id', 'url' => '/templateElements/edit/file/' . $id));
+    echo $this->Form->create('TemplateElementFile', array('id', 'url' => $baseurl . '/templateElements/edit/file/' . $id));
 ?>
     <legend><?php echo __('Edit File Element'); ?></legend>
     <fieldset>
diff --git a/app/View/TemplateElements/ajax/template_element_edit_text.ctp b/app/View/TemplateElements/ajax/template_element_edit_text.ctp
index 46284a4e7..bef4192d0 100644
--- a/app/View/TemplateElements/ajax/template_element_edit_text.ctp
+++ b/app/View/TemplateElements/ajax/template_element_edit_text.ctp
@@ -1,6 +1,6 @@
 <div class="template_element_add_text">
 <?php
-    echo $this->Form->create('TemplateElementText', array('id', 'url' => '/templateElements/edit/text/' . $id));
+    echo $this->Form->create('TemplateElementText', array('id', 'url' => $baseurl . '/templateElements/edit/text/' . $id));
 ?>
     <legend><?php echo __('Add Text Element To Template'); ?></legend>
     <fieldset>
diff --git a/app/View/Templates/populate_event_from_template_attributes.ctp b/app/View/Templates/populate_event_from_template_attributes.ctp
index 0d89fed54..a56a6d0e1 100644
--- a/app/View/Templates/populate_event_from_template_attributes.ctp
+++ b/app/View/Templates/populate_event_from_template_attributes.ctp
@@ -22,7 +22,7 @@ foreach ($attributes as $item):?>
 endforeach;?>
     </table>
     <div style="float:left;">
-        <?php echo $this->Form->create('Template', array('url' => '/templates/submitEventPopulation/' . $template_id . '/' . $event_id));?>
+        <?php echo $this->Form->create('Template', array('url' => $baseurl . '/templates/submitEventPopulation/' . $template_id . '/' . $event_id));?>
             <fieldset>
                 <?php
                     echo $this->Form->input('attributes', array(
diff --git a/app/View/Threads/index.ctp b/app/View/Threads/index.ctp
index 0e9e3b09c..3c131af91 100644
--- a/app/View/Threads/index.ctp
+++ b/app/View/Threads/index.ctp
@@ -28,13 +28,12 @@
             <th><?php echo __('Actions');?></th>
     </tr>
     <?php
-    $url = Configure::read('MISP.baseurl');
 foreach ($threads as $thread):
     $lastPost = end($thread['Post']);
     ?>
 
         <tr>
-            <td class="short" style="text-align: left;" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" style="text-align: left;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     $imgRelativePath = 'orgs' . DS . h($thread['Organisation']['name']) . '.png';
                     $imgAbsolutePath = APP . WEBROOT_DIR . DS . 'img' . DS . $imgRelativePath;
@@ -43,37 +42,37 @@ foreach ($threads as $thread):
                 ?>
                 &nbsp;
             </td>
-            <td ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     echo h($thread['Thread']['title']);
                 ?>
             </td>
-            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     echo h($thread['Thread']['date_modified']);
                 ?>
                 &nbsp;
             </td>
-            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     echo isset($lastPost['User']['email']) ? h($lastPost['User']['email']) : '';
                 ?>
                 &nbsp;
             </td>
-            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" style="text-align: center;" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     echo h($thread['Thread']['date_created']);
                 ?>
             </td>
-            <td class="short" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     echo h($thread['Thread']['post_count']);
                 ?>
             </td>
-            <td class="short" ondblclick="document.location.href ='<?php echo $url;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
+            <td class="short" ondblclick="document.location.href ='<?php echo $baseurl;?>/threads/view/<?php echo $thread['Thread']['id'];?>'">
                 <?php
                     if ($thread['Thread']['distribution'] < 4) echo $distributionLevels[$thread['Thread']['distribution']];
-                    else echo '<a href="/sharing_groups/view/' . h($thread['Thread']['sharing_group_id']) . '" title="' . h($thread['SharingGroup']['name']) . '">Sharing group</a>';
+                    else echo '<a href="' . $baseurl . '/sharing_groups/view/' . h($thread['Thread']['sharing_group_id']) . '" title="' . h($thread['SharingGroup']['name']) . '">Sharing group</a>';
                 ?>
             </td>
             <td class="short action-links">
diff --git a/app/View/Users/admin_index.ctp b/app/View/Users/admin_index.ctp
index aa35d4f80..135ceb5f7 100755
--- a/app/View/Users/admin_index.ctp
+++ b/app/View/Users/admin_index.ctp
@@ -139,7 +139,7 @@
                 array(
                     'name' => __('Monitored'),
                     'element' => 'toggle',
-                    'url' => '/admin/users/monitor',
+                    'url' => $baseurl . '/admin/users/monitor',
                     'url_params_data_paths' => array(
                         'User.id'
                     ),
@@ -183,17 +183,23 @@
                                 $options['isSiteAdmin']
                             );
                         }
+                        array(
+                            'requirement' => count($passedArgsArray) > 0,
+                            'url' => $baseurl . '/admin/users/index',
+                            'title' => __('Remove filters'),
+                            'fa-icon' => 'times'
+                        )
                     )
                 ),
                 array(
-                    'url' => '/admin/users/edit',
+                    'url' => $baseurl . '/admin/users/edit',
                     'url_params_data_paths' => array(
                         'User.id'
                     ),
                     'icon' => 'edit'
                 ),
                 array(
-                    'url' => '/admin/users/delete',
+                    'url' => $baseurl . '/admin/users/delete',
                     'url_params_data_paths' => array(
                         'User.id'
                     ),
@@ -202,7 +208,7 @@
                     'icon' => 'trash'
                 ),
                 array(
-                    'url' => '/admin/users/view',
+                    'url' => $baseurl . '/admin/users/view',
                     'url_params_data_paths' => array(
                         'User.id'
                     ),
diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp
index 0c736e7cf..6c1dc862f 100644
--- a/app/View/Users/login.ctp
+++ b/app/View/Users/login.ctp
@@ -19,7 +19,7 @@
         <?php if (Configure::read('MISP.main_logo') && file_exists(APP . '/webroot/img/custom/' . Configure::read('MISP.main_logo'))): ?>
             <img src="<?php echo $baseurl?>/img/custom/<?php echo h(Configure::read('MISP.main_logo'));?>" style=" display:block; margin-left: auto; margin-right: auto;" />
         <?php else: ?>
-            <img src="/img/misp-logo.png" style="display:block; margin-left: auto; margin-right: auto;"/>
+            <img src="<?php echo $baseurl?>/img/misp-logo.png" style="display:block; margin-left: auto; margin-right: auto;"/>
         <?php endif;?>
         </div>
         <?php
diff --git a/app/View/Users/statistics_orgs.ctp b/app/View/Users/statistics_orgs.ctp
index 6f22950ea..1e933ec6f 100644
--- a/app/View/Users/statistics_orgs.ctp
+++ b/app/View/Users/statistics_orgs.ctp
@@ -22,7 +22,7 @@
             <?php
                 foreach ($types as $key => $value):
             ?>
-                <span class="tabMenuFixed tabMenuFixedCenter tabMenuSides useCursorPointer <?php if ($value['selected']) echo 'tabMenuActive'; ?>" onclick="window.location='/users/statistics/orgs/scope:<?php echo h($key);?>'"><?php echo h($value['text']); ?></span>
+		<span class="tabMenuFixed tabMenuFixedCenter tabMenuSides useCursorPointer <?php if ($value['selected']) echo 'tabMenuActive'; ?>" onclick="window.location='<?php echo $baseurl; ?>/users/statistics/orgs/scope:<?php echo h($key);?>'"><?php echo h($value['text']); ?></span>
             <?php
                 endforeach;
             ?>
diff --git a/app/View/Warninglists/ajax/getToggleField.ctp b/app/View/Warninglists/ajax/getToggleField.ctp
index 27b3884d4..b36089ad8 100644
--- a/app/View/Warninglists/ajax/getToggleField.ctp
+++ b/app/View/Warninglists/ajax/getToggleField.ctp
@@ -1,4 +1,4 @@
 <?php
-echo $this->Form->create('Warninglist', array('id' => 'WarninglistIndexForm', 'url' => '/warninglists/toggleEnable'));
+echo $this->Form->create('Warninglist', array('id' => 'WarninglistIndexForm', 'url' => $baseurl . '/warninglists/toggleEnable'));
 echo $this->Form->input('data', array('id' => 'WarninglistData', 'label' => false, 'style' => 'display:none;'));
 echo $this->Form->end();
diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
index a20545b49..e6e5f64d7 100755
--- a/app/View/Warninglists/index.ctp
+++ b/app/View/Warninglists/index.ctp
@@ -19,7 +19,7 @@
     <div id="hiddenFormDiv">
     <?php
         if ($isSiteAdmin) {
-            echo $this->Form->create('Warninglist', array('url' => '/warninglists/toggleEnable'));
+            echo $this->Form->create('Warninglist', array('url' => $baseurl . '/warninglists/toggleEnable'));
             echo $this->Form->input('data', array('label' => false, 'style' => 'display:none;'));
             echo $this->Form->end();
         }
diff --git a/app/webroot/css/famfamfam-flags.css b/app/webroot/css/famfamfam-flags.css
index 67a62ac8c..b05ad5359 100644
--- a/app/webroot/css/famfamfam-flags.css
+++ b/app/webroot/css/famfamfam-flags.css
@@ -12,7 +12,7 @@
   height: 11px;
   line-height: 11px;
   /* vertical-align: text-top; */
-  background-image: url("/img/famfamfam-flags/famfamfam-flags.png");
+  background-image: url("../img/famfamfam-flags/famfamfam-flags.png");
   background-position: 0 0;
   background-repeat: no-repeat;
 }
diff --git a/app/webroot/js/attack_matrix.js b/app/webroot/js/attack_matrix.js
index fd6278736..0e0956876 100644
--- a/app/webroot/js/attack_matrix.js
+++ b/app/webroot/js/attack_matrix.js
@@ -60,7 +60,7 @@
 		});
 		$('.statistics_attack_matrix .matrix-interaction').off('click.interaction').on('click.interaction', function(event) {
 			var clusterId = $(this).attr('data-cluster-id');
-			window.location = '/galaxy_clusters/view/' + clusterId;
+			window.location = baseurl + '/galaxy_clusters/view/' + clusterId;
 		});
 		scoredCells.hover(function() { enteringScoredCell($(this), '.statistics_attack_matrix'); }, function() { leavingScoredCell('.statistics_attack_matrix'); });
 		$('.statistics_attack_matrix #checkbox_attackMatrix_showAll').off('click.showAll').on('click.showAll', function() { toggleAttackMatrixCells('.statistics_attack_matrix'); });
diff --git a/app/webroot/js/correlation-graph.js b/app/webroot/js/correlation-graph.js
index eda158107..c6e05d670 100644
--- a/app/webroot/js/correlation-graph.js
+++ b/app/webroot/js/correlation-graph.js
@@ -107,7 +107,7 @@ $(document).ready( function() {
   var scope_id = $('#graph_init').data('id');
   var scope = $('#graph_init').data('scope');
 
-  d3.json("/events/updateGraph/" + scope_id + "/" + scope + ".json", function(error, json) {
+  d3.json(baseurl + "/events/updateGraph/" + scope_id + "/" + scope + ".json", function(error, json) {
   	root = json;
   	update();
   });
@@ -334,9 +334,9 @@ $(document).ready( function() {
   function createInfoPane(d, data, type) {
   	var i = 0;
   	var view_urls = {
-  		'event': '/events/view/' + parseInt(d.id),
-  		'tag': '/tags/view/' + parseInt(d.id),
-  		'galaxy': '/galaxy_clusters/view/' + parseInt(d.id)
+  		'event': baseurl + '/events/view/' + parseInt(d.id),
+  		'tag': baseurl + '/tags/view/' + parseInt(d.id),
+  		'galaxy': baseurl + '/galaxy_clusters/view/' + parseInt(d.id)
   	};
   	data["fields"].forEach(function(e) {
   		var title = e;
@@ -417,7 +417,7 @@ $(document).ready( function() {
 
   function expand(d) {
   	if (d.type == 'event' || d.type == 'galaxy' || d.type == 'tag') {
-  		d3.xhr("/events/updateGraph/" + d.id + "/" + d.type + ".json")
+  		d3.xhr(baseurl + "/events/updateGraph/" + d.id + "/" + d.type + ".json")
   	    .header("Content-Type", "application/json")
   	    .post(
   	        JSON.stringify(root),
diff --git a/app/webroot/js/event-distribution-graph.js b/app/webroot/js/event-distribution-graph.js
index df3b3bf88..9917aaee4 100644
--- a/app/webroot/js/event-distribution-graph.js
+++ b/app/webroot/js/event-distribution-graph.js
@@ -386,7 +386,7 @@ function construct_piechart(data) {
 
 function fetchDistributionData(callback) {
     $.ajax({
-        url: "/events/"+"getDistributionGraph"+"/"+scope_id+"/event.json",
+        url: baseurl + "/events/"+"getDistributionGraph"+"/"+scope_id+"/event.json",
         dataType: 'json',
         type: 'post',
         contentType: 'application/json',
diff --git a/app/webroot/js/event-graph.js b/app/webroot/js/event-graph.js
index 0abf9050d..1e17ed862 100644
--- a/app/webroot/js/event-graph.js
+++ b/app/webroot/js/event-graph.js
@@ -1417,7 +1417,7 @@ class DataHandler {
             var extended_text = dataHandler.extended_event ? "extended:1" : "";
             eventGraph.canDrawHull = false;
             $.ajax({
-                url: "/events/"+dataHandler.get_scope_url()+"/"+scope_id+"/"+extended_text+"/event.json",
+                url: baseurl+"/events/"+dataHandler.get_scope_url()+"/"+scope_id+"/"+extended_text+"/event.json",
                 dataType: 'json',
                 type: 'post',
                 contentType: 'application/json',
@@ -1462,13 +1462,13 @@ class DataHandler {
     }
 
     fetch_reference_data(rel_uuid, callback) {
-        $.getJSON( "/events/getReferenceData/"+rel_uuid+"/reference.json", function( data ) {
+        $.getJSON(baseurl + "/events/getReferenceData/"+rel_uuid+"/reference.json", function( data ) {
             callback(data);
         });
     }
 
     fetch_objects_template() {
-        return $.getJSON( "/events/getObjectTemplate/templates.json", function( data ) {
+        return $.getJSON(baseurl + "/events/getObjectTemplate/templates.json", function( data ) {
             for (var i in data) {
                 var template = data[i].ObjectTemplate;
                 var requiredFields;
@@ -1503,7 +1503,7 @@ class DataHandler {
     }
 
     fetch_graph_history(callback) {
-        $.getJSON( "/eventGraph/view/"+scope_id, function( history ) {
+        $.getJSON(baseurl + "/eventGraph/view/"+scope_id, function( history ) {
             var history_formatted = [];
             var network_previews = [];
             history.forEach(function(item) {
@@ -1582,7 +1582,7 @@ class MispInteraction {
             return;
         }
         var edgeFromId = edgeData.from.startsWith('o-') ? edgeData.from.substr(2) : edgeData.from;
-        genericPopup('/objectReferences/add/'+edgeFromId, '#popover_form', function() {
+        genericPopup(baseurl + '/objectReferences/add/'+edgeFromId, '#popover_form', function() {
             $('#ObjectReferenceReferencedUuid').val(uuid);
             objectReferenceInput();
         });
@@ -1604,7 +1604,7 @@ class MispInteraction {
         dataHandler.fetch_reference_data(rel_uuid, function(data) {
             data = data[0].ObjectReference;
             var uuid = data.referenced_uuid;
-            genericPopup('/objectReferences/add/'+data.object_id, '#popover_form', function() {
+            genericPopup(baseurl + '/objectReferences/add/'+data.object_id, '#popover_form', function() {
                 $('#targetSelect').val(uuid);
                 $('#ObjectReferenceComment').val(data.comment);
                 $('#ObjectReferenceRelationshipTypeSelect').val(data.relationship_type);
@@ -1638,7 +1638,7 @@ class MispInteraction {
             },
             {
                 text: "Add an Attribute",
-                onclick: "simplePopup('/attributes/add/"+scope_id+"');"
+                onclick: "simplePopup('"+baseurl+"/attributes/add/"+scope_id+"');"
             },
         ]);
     }
@@ -1662,9 +1662,9 @@ class MispInteraction {
         var group = nodes.get(id).group;
         id = id.startsWith('o-') ? id.substr(2) : id;
         if (group.slice(0, 9) == 'attribute') {
-            simplePopup('/attributes/edit/'+id);
+            simplePopup(baseurl + '/attributes/edit/' + id);
         } else if (group == 'object') {
-            window.location = '/objects/edit/'+id;
+            window.location = baseurl + '/objects/edit/' + id;
         }
     }
 
@@ -1675,7 +1675,7 @@ class MispInteraction {
 
     delete_saved_network(data) {
         var network_id = data[0];
-        var url = "/" + "eventGraph" + "/" + "delete" + "/" + network_id;
+        var url = baseurl + "/" + "eventGraph" + "/" + "delete" + "/" + network_id;
         $.get(url, function(data) {
             openPopup("#confirmation_box");
             $("#confirmation_box").html(data);
@@ -1727,7 +1727,7 @@ class MispInteraction {
     }
 
     networkFetchForm(type, event_id, network_id, callback) {
-        var url = '/' + 'EventGraph' + '/' + 'add' + '/' + event_id;
+        var url = baseurl + '/' + 'EventGraph' + '/' + 'add' + '/' + event_id;
         $.ajax({
             beforeSend: function(XMLHttpRequest) {
                 $('.loading').show();
@@ -2506,4 +2506,4 @@ function isPicture(filename) {
     var extension = filename.split('.').pop()
     var validExtensions = ['jpg', 'jpeg', 'png', 'gif']
     return validExtensions.includes(extension)
-}
\ No newline at end of file
+}
diff --git a/app/webroot/js/keyboard-shortcuts.js b/app/webroot/js/keyboard-shortcuts.js
index 9fb44110a..2081eefff 100644
--- a/app/webroot/js/keyboard-shortcuts.js
+++ b/app/webroot/js/keyboard-shortcuts.js
@@ -22,7 +22,7 @@ let keyboardShortcutsManager = {
 		let shortcutURIs = [];
 		for(let keyboardShortcutElement of $('.keyboardShortcutsConfig')) {
 			shortcutURIs.push(keyboardShortcutElement.value);
-			this.ajaxGet(window.location.protocol + "//" + window.location.host + keyboardShortcutElement.value).then(response => {
+			this.ajaxGet(baseurl + keyboardShortcutElement.value).then(response => {
 				this.mapKeyboardShortcuts(JSON.parse(response));
 			});
 		}
@@ -113,4 +113,4 @@ let keyboardShortcutsManager = {
 $(document).ready(() => keyboardShortcutsManager.init());
 
 // Inits the click event on the keyboard shortcut triangle at the bottom of the screen.
-$('#triangle').click(keyboardShortcutsManager.onTriangleClick);
\ No newline at end of file
+$('#triangle').click(keyboardShortcutsManager.onTriangleClick);
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 2cf91063f..511fabaf7 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -42,7 +42,7 @@ function xhrFailCallback(xhr) {
 }
 
 function deleteObject(type, action, id) {
-    var url = "/" + type + "/" + action + "/" + id;
+    var url = baseurl + "/" + type + "/" + action + "/" + id;
     $.get(url, function(data) {
         openPopup("#confirmation_box");
         $("#confirmation_box").html(data);
@@ -50,7 +50,7 @@ function deleteObject(type, action, id) {
 }
 
 function quickDeleteSighting(id, rawId, context) {
-    url = "/sightings/quickDelete/" + id + "/" + rawId + "/" + context;
+    url = baseurl + "/sightings/quickDelete/" + id + "/" + rawId + "/" + context;
     $.get(url, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
@@ -58,7 +58,7 @@ function quickDeleteSighting(id, rawId, context) {
 }
 
 function fetchAddSightingForm(type, attribute_id, page, onvalue) {
-    var url = "/sightings/quickAdd/" + attribute_id + "/" + type;
+    var url = baseurl + "/sightings/quickAdd/" + attribute_id + "/" + type;
     if (onvalue) {
         url = url + "/1";
     } else {
@@ -94,14 +94,14 @@ function publishPopup(id, type) {
     if (type == "unpublish") action = "unpublish";
     if (type == "sighting") action = "publishSightings";
     var destination = 'attributes';
-    $.get( "/events/" + action + "/" + id, function(data) {
+    $.get(baseurl + "/events/" + action + "/" + id, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
 }
 
 function delegatePopup(id) {
-    simplePopup("/event_delegations/delegateEvent/" + id);
+    simplePopup(baseurl + "/event_delegations/delegateEvent/" + id);
 }
 
 function genericPopup(url, popupTarget, callback) {
@@ -143,7 +143,7 @@ function submitPublish(id, type) {
 }
 
 function editTemplateElement(type, id) {
-    simplePopup("/template_elements/edit/" + type + "/" + id);
+    simplePopup(baseurl + "/template_elements/edit/" + type + "/" + id);
 }
 
 function cancelPrompt(isolated) {
@@ -180,7 +180,7 @@ function submitDeletion(context_id, action, type, id) {
         },
         type:"post",
         cache: false,
-        url:"/" + type + "/" + action + "/" + id,
+        url: baseurl + "/" + type + "/" + action + "/" + id,
     });
 }
 
@@ -201,7 +201,7 @@ function removeSighting(caller) {
             handleGenericAjaxResponse(data);
             var org = "/" + $('#org_id').text();
             updateIndex(id, 'event');
-            $.get( "/sightings/listSightings/" + rawid + "/" + context + org, function(data) {
+            $.get(baseurl + "/sightings/listSightings/" + rawid + "/" + context + org, function(data) {
                 $("#sightingsData").html(data);
             });
         },
@@ -211,7 +211,7 @@ function removeSighting(caller) {
         },
         type:"post",
         cache: false,
-        url:"/sightings/quickDelete/" + id + "/" + rawid + "/" + context,
+        url: baseurl + "/sightings/quickDelete/" + id + "/" + rawid + "/" + context,
     });
 }
 
@@ -261,7 +261,7 @@ function toggleSetting(e, setting, id) {
             handleGenericAjaxResponse(data);
         },
         complete:function() {
-            $.get(replacementForm, function(data) {
+            $.get(baseurl + replacementForm, function(data) {
                 $('#hiddenFormDiv').html(data);
             });
             $(".loading").hide();
@@ -278,7 +278,7 @@ function toggleSetting(e, setting, id) {
 }
 
 function initiatePasswordReset(id) {
-    $.get( "/users/initiatePasswordReset/" + id, function(data) {
+    $.get(baseurl + "/users/initiatePasswordReset/" + id, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -286,7 +286,7 @@ function initiatePasswordReset(id) {
 
 function submitPasswordReset(id) {
     var formData = $('#PromptForm').serialize();
-    var url = "/users/initiatePasswordReset/" + id;
+    var url = baseurl + "/users/initiatePasswordReset/" + id;
     $.ajax({
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
@@ -347,7 +347,7 @@ function acceptObject(type, id, event) {
         error: xhrFailCallback,
         type: "post",
         cache: false,
-        url: "/shadow_attributes/accept/" + id,
+        url: baseurl + "/shadow_attributes/accept/" + id,
     });
 }
 
@@ -371,7 +371,7 @@ function toggleCorrelation(id, skip_reload) {
         },
         type:"post",
         cache: false,
-        url:'/attributes/toggleCorrelation/' + id,
+        url: baseurl + '/attributes/toggleCorrelation/' + id,
     });
 }
 
@@ -395,7 +395,7 @@ function toggleToIDS(id, skip_reload) {
         },
         type:"post",
         cache: false,
-        url:'/attributes/editField/' + id ,
+        url: baseurl + '/attributes/editField/' + id ,
     });
 }
 
@@ -418,7 +418,7 @@ function updateIndex(id, context, newPage) {
         div = "#attributes_div";
     }
     if (context == 'template') {
-        url = "/template_elements/index/" + id;
+        url = baseurl + "/template_elements/index/" + id;
         div = "#templateElements";
     }
     $.ajax({
@@ -464,7 +464,7 @@ function updateAttributeFieldOnSuccess(name, type, id, field, event) {
                 $('#' + type + '_' + id + '_' + 'timestamp_solid').html(data);
             }
         },
-        url:"/attributes/fetchViewValue/" + id + "/" + field,
+        url: baseurl + "/attributes/fetchViewValue/" + id + "/" + field,
     });
 }
 
@@ -487,7 +487,7 @@ function updateObjectFieldOnSuccess(name, type, id, field, event) {
                 $('#' + type + '_' + id + '_' + 'timestamp_solid').html(data);
             }
         },
-        url:"/objects/fetchViewValue/" + id + "/" + field,
+        url: baseurl + "/objects/fetchViewValue/" + id + "/" + field,
     });
 }
 
@@ -513,7 +513,7 @@ function activateField(type, id, field, event) {
             $(container_name + '_placeholder').html(data);
             postActivationScripts(name, type, id, field, event);
         },
-        url:"/" + objectType + "/fetchEditForm/" + id + "/" + field,
+        url: baseurl + "/" + objectType + "/fetchEditForm/" + id + "/" + field,
     });
 }
 
@@ -607,7 +607,7 @@ function addSighting(type, attribute_id, event_id, page) {
             updateIndex(context, 'event');
         },
         type:"post",
-        url:"/sightings/add/" + attribute_id
+        url: baseurl + "/sightings/add/" + attribute_id
     });
 }
 
@@ -651,7 +651,7 @@ function submitForm(type, id, field, context) {
             updateIndex(context, 'event');
         },
         type:"post",
-        url:"/" + object_type + "/" + action + "/" + id
+        url: baseurl + "/" + object_type + "/" + action + "/" + id
     });
     $(name + '_field').unbind("keyup");
     $(name + '_form').unbind("focusout");
@@ -664,7 +664,7 @@ function quickSubmitTagForm(selected_tag_ids, addData) {
     if (undefined != addData['local'] && addData['local']) {
         localFlag = '/local:1';
     }
-    url = "/events/addTag/" + event_id + localFlag;
+    url = baseurl + "/events/addTag/" + event_id + localFlag;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #EventTag').val(JSON.stringify(selected_tag_ids));
@@ -703,7 +703,7 @@ function quickSubmitAttributeTagForm(selected_tag_ids, addData) {
     if (undefined != addData['local'] && addData['local']) {
         localFlag = '/local:1';
     }
-    url = "/attributes/addTag/" + attribute_id + localFlag;
+    url = baseurl + "/attributes/addTag/" + attribute_id + localFlag;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #AttributeTag').val(JSON.stringify(selected_tag_ids));
@@ -747,7 +747,7 @@ function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
     if (undefined != addData['local'] && addData['local']) {
         localFlag = '/local:1';
     }
-    url = "/tag_collections/addTag/" + tag_collection_id + localFlag;
+    url = baseurl + "/tag_collections/addTag/" + tag_collection_id + localFlag;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #TagCollectionTag').val(JSON.stringify(selected_tag_ids));
@@ -779,7 +779,7 @@ function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
 function refreshTagCollectionRow(tag_collection_id) {
     $.ajax({
         type:"get",
-        url:"/tag_collections/getRow/" + tag_collection_id,
+        url: baseurl + "/tag_collections/getRow/" + tag_collection_id,
         error:function() {
             showMessage('fail', 'Could not fetch updates to the modified row.');
         },
@@ -906,7 +906,7 @@ function multiSelectDeleteEvents() {
             }
         }
     });
-    $.get("/events/delete/" + JSON.stringify(selected), function(data) {
+    $.get(baseurl + "/events/delete/" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -922,7 +922,7 @@ function multiSelectToggleFeeds(on, cache) {
             }
         }
     });
-    $.get("/feeds/toggleSelected/" + on + "/" + cache + "/" + JSON.stringify(selected), function(data) {
+    $.get(baseurl + "/feeds/toggleSelected/" + on + "/" + cache + "/" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -938,7 +938,7 @@ function multiSelectDeleteEventBlacklist(on, cache) {
             }
         }
     });
-    $.get("/eventBlacklists/massDelete?ids=" + JSON.stringify(selected), function(data) {
+    $.get(baseurl + "/eventBlacklists/massDelete?ids=" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -983,7 +983,7 @@ function multiSelectAction(event, context) {
             var url = $('#delete_selected').attr('action');
             console.log(url);
         } else {
-            var url = "/" + settings[context]["controller"] + "/" + settings[context]["action"] + "Selected/" + event;
+            var url = baseurl + "/" + settings[context]["controller"] + "/" + settings[context]["action"] + "Selected/" + event;
         }
         $.ajax({
             data: formData,
@@ -1003,11 +1003,11 @@ function multiSelectAction(event, context) {
 function editSelectedAttributes(event) {
     var selectedAttributeIds = getSelected();
     var data = { selected_ids: selectedAttributeIds }
-    simplePopup("/attributes/getMassEditForm/" + event, 'POST', data);
+    simplePopup(baseurl + "/attributes/getMassEditForm/" + event, 'POST', data);
 }
 
 function addSelectedTaxonomies(taxonomy) {
-    $.get("/taxonomies/taxonomyMassConfirmation/"+taxonomy, function(data) {
+    $.get(baseurl + "/taxonomies/taxonomyMassConfirmation/"+taxonomy, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -1019,14 +1019,14 @@ function proposeObjectsFromSelectedAttributes(clicked, event_id) {
 }
 
 function hideSelectedTags(taxonomy) {
-	$.get("/taxonomies/taxonomyMassHide/"+taxonomy, function(data) {
+	$.get(baseurl + "/taxonomies/taxonomyMassHide/"+taxonomy, function(data) {
 		$("#confirmation_box").html(data);
 		openPopup("#confirmation_box");
 	});
 }
 
 function unhideSelectedTags(taxonomy) {
-	$.get("/taxonomies/taxonomyMassUnhide/"+taxonomy, function(data) {
+	$.get(baseurl + "/taxonomies/taxonomyMassUnhide/"+taxonomy, function(data) {
 		$("#confirmation_box").html(data);
 		openPopup("#confirmation_box");
 	});
@@ -1072,7 +1072,7 @@ function loadEventTags(id) {
         success:function (data, textStatus) {
             $(".eventTagContainer").html(data);
         },
-        url:"/tags/showEventTag/" + id,
+        url: baseurl + "/tags/showEventTag/" + id,
     });
 }
 
@@ -1087,7 +1087,7 @@ function loadGalaxies(id, scope) {
                 $("#attribute_" + id + "_galaxy").html(data);
             }
         },
-        url:"/galaxies/showGalaxies/" + id + "/" + scope,
+        url: baseurl + "/galaxies/showGalaxies/" + id + "/" + scope,
     });
 }
 
@@ -1098,7 +1098,7 @@ function loadTagCollectionTags(id) {
         success:function (data, textStatus) {
             $(".tagCollectionTagContainer").html(data);
         },
-        url:"/tags/showEventTag/" + id,
+        url: baseurl + "/tags/showEventTag/" + id,
     });
 }
 
@@ -1113,7 +1113,7 @@ function removeEventTag(event, tag) {
             data: formData,
             type:"POST",
             cache: false,
-            url:"/events/removeTag/" + event + '/' + tag,
+            url: baseurl + "/events/removeTag/" + event + '/' + tag,
             success:function (data, textStatus) {
                 loadEventTags(event);
                 handleGenericAjaxResponse(data);
@@ -1133,12 +1133,12 @@ function loadAttributeTags(id) {
         success:function (data, textStatus) {
             $("#Attribute_"+id+"_tr .attributeTagContainer").html(data);
         },
-        url:"/tags/showAttributeTag/" + id
+        url: baseurl + "/tags/showAttributeTag/" + id
     });
 }
 
 function removeObjectTagPopup(clicked, context, object, tag) {
-    $.get( "/" + context + "s/removeTag/" + object + '/' + tag, function(data) {
+    $.get(baseurl + "/" + context + "s/removeTag/" + object + '/' + tag, function(data) {
         openPopover(clicked, data);
     });
 }
@@ -1152,7 +1152,7 @@ function removeObjectTag(context, object, tag) {
         data: formData,
         type:"POST",
         cache: false,
-        url:"/" + context.toLowerCase() + "s/removeTag/" + object + '/' + tag,
+        url: baseurl + "/" + context.toLowerCase() + "s/removeTag/" + object + '/' + tag,
         success:function (data, textStatus) {
             $("#confirmation_box").fadeOut();
             $("#gray_out").fadeOut();
@@ -1174,13 +1174,13 @@ function removeObjectTag(context, object, tag) {
 
 function redirectAddObject(templateId, additionalData) {
     var eventId = additionalData['event_id'];
-    window.location = '/objects/add/' + eventId + '/' + templateId;
+    window.location = baseurl + '/objects/add/' + eventId + '/' + templateId;
 }
 
 function clickCreateButton(event, type) {
     var destination = 'attributes';
     if (type == 'Proposal') destination = 'shadow_attributes';
-    simplePopup("/" + destination + "/add/" + event);
+    simplePopup(baseurl + "/" + destination + "/add/" + event);
 }
 
 function openGenericModal(url) {
@@ -1251,13 +1251,13 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
             closePopover = false;
             break;
         case 'addObjectReference':
-            url = "/objectReferences/add/" + context_id;
+            url = baseurl + "/objectReferences/add/" + context_id;
             break;
         case 'quickAddAttributeForm':
-            url = "/objects/quickAddAttributeForm/" + context_id;
+            url = baseurl + "/objects/quickAddAttributeForm/" + context_id;
             break;
         case 'acceptUserRegistrations':
-            url = "/users/acceptRegistrations/" + context_id
+            url = baseurl + "/users/acceptRegistrations/" + context_id
             break;
     }
     if ($("#submitButton").parent().hasClass('modal-footer')) {
@@ -1296,7 +1296,7 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
             }
             if (referer == 'addSighting') {
                 updateIndex(update_context_id, 'event');
-                $.get( "/sightings/listSightings/" + id + "/attribute", function(data) {
+                $.get(baseurl + "/sightings/listSightings/" + id + "/attribute", function(data) {
                     $("#sightingsData").html(data);
                 });
                 $('.sightingsToggle').removeClass('btn-primary');
@@ -1454,7 +1454,7 @@ function updateHistogram(selected) {
             $(".loading").hide();
             $("#histogram").html(data);
         },
-        url:"/users/histogram/" + selected,
+        url: baseurl + "/users/histogram/" + selected,
     });
 }
 
@@ -1513,7 +1513,7 @@ function appendTemplateTag(selected_id) {
             $(".loading").hide();
             $("#tags").append(data);
         },
-        url:"/tags/viewTag/" + selected_id,
+        url: baseurl + "/tags/viewTag/" + selected_id,
     });
     updateSelectedTags();
 }
@@ -1553,16 +1553,16 @@ function saveElementSorting(order) {
         },
         type:"post",
         cache: false,
-        url:"/templates/saveElementSorting/",
+        url: baseurl + "/templates/saveElementSorting/",
     });
 }
 
 function templateAddElementClicked(id) {
-    simplePopup("/template_elements/templateElementAddChoices/" + id);
+    simplePopup(baseurl + "/template_elements/templateElementAddChoices/" + id);
 }
 
 function templateAddElement(type, id) {
-    simplePopup("/template_elements/add/" + type + "/" + id);
+    simplePopup(baseurl + "/template_elements/add/" + type + "/" + id);
 }
 
 function templateUpdateAvailableTypes() {
@@ -1763,7 +1763,7 @@ function getMatrixPopup(scope, scope_id, galaxy_id) {
 
 function getPopup(id, context, target, admin, popupType) {
     $("#gray_out").fadeIn();
-    var url = "";
+    var url = baseurl;
     if (typeof admin !== 'undefined' && admin != '') url+= "/admin";
     if (context != '') {
         url += "/" + context;
@@ -1794,7 +1794,7 @@ function getPopup(id, context, target, admin, popupType) {
 
 // Same as getPopup function but create a popover to populate first
 function popoverPopup(clicked, id, context, target, admin) {
-    var url = "";
+    var url = baseurl;
     if (typeof admin !== 'undefined' && admin != '') url+= "/admin";
     if (context != '') {
         url += "/" + context;
@@ -2026,7 +2026,7 @@ function templateDeleteFileBubble(filename, tmp_name, element_id, context, batch
     $.ajax({
         type:"post",
         cache: false,
-        url:"/templates/deleteTemporaryFile/" + tmp_name,
+        url: baseurl + "/templates/deleteTemporaryFile/" + tmp_name,
     });
     var c = this;
     if (context == 'iframe') {
@@ -2067,7 +2067,7 @@ function freetextRemoveRow(id, event_id) {
     $('#row_' + id).hide();
     $('#Attribute' + id + 'Save').attr("value", "0");
     if ($(".freetext_row:visible").length == 0) {
-        window.location = "/events/" + event_id;
+        window.location = baseurl + "/events/" + event_id;
     }
 }
 
@@ -2176,13 +2176,13 @@ function executeFilter(passedArgs, url) {
 }
 
 function quickFilterTaxonomy(taxonomy_id, passedArgs) {
-    var url = "/taxonomies/view/" + taxonomy_id + "/filter:" + encodeURIComponent($('#quickFilterField').val());
+    var url = baseurl + "/taxonomies/view/" + taxonomy_id + "/filter:" + encodeURIComponent($('#quickFilterField').val());
     window.location.href=url;
 }
 
 function quickFilterRemoteEvents(passedArgs, id) {
     passedArgs["searchall"] = $('#quickFilterField').val();
-    var url = "/servers/previewIndex/" + id;
+    var url = baseurl + "/servers/previewIndex/" + id;
     for (var key in passedArgs) {
         url += "/" + key + ":" + encodeURIComponent(passedArgs[key]);
     }
@@ -2471,7 +2471,7 @@ function serverSettingsActivateField(setting, id) {
             $(fieldName + "_placeholder").show();
             serverSettingsPostActivationScripts(fieldName, setting, id);
         },
-        url:"/servers/serverSettingsEdit/" + setting + "/" + id,
+        url: baseurl + "/servers/serverSettingsEdit/" + setting + "/" + id,
     });
 }
 
@@ -2521,7 +2521,7 @@ function serverSettingSubmitForm(name, setting, id) {
         success:function (data, textStatus) {
             $.ajax({
                 type:"get",
-                url:"/servers/serverSettingsReloadSetting/" + setting + "/" + id,
+                url: baseurl + "/servers/serverSettingsReloadSetting/" + setting + "/" + id,
                 success:function (data2, textStatus2) {
                     $('#' + subGroup + "_" + id + '_row').replaceWith(data2);
                     $(".loading").hide();
@@ -2537,7 +2537,7 @@ function serverSettingSubmitForm(name, setting, id) {
             $('.inline-field-placeholder').hide();
         },
         type:"post",
-        url:"/servers/serverSettingsEdit/" + setting + "/" + id + "/" + 1
+        url: baseurl + "/servers/serverSettingsEdit/" + setting + "/" + id + "/" + 1
     });
     $(name + '_field').unbind("keyup");
     $(name + '_form').unbind("focusout");
@@ -2547,7 +2547,7 @@ function serverSettingSubmitForm(name, setting, id) {
 function updateOrgCreateImageField(string) {
     string = encodeURIComponent(string);
     $.ajax({
-        url:'/img/orgs/' + string + '.png',
+        url:baseurl _+ '/img/orgs/' + string + '.png';
         type:'HEAD',
         error:
             function(){
@@ -2555,14 +2555,14 @@ function updateOrgCreateImageField(string) {
             },
         success:
             function(){
-                $('#logoDiv').html('<img src="/img/orgs/' + string + '.png" style="width:24px;height:24px;"></img>');
+                $('#logoDiv').html('<img src="' + imgsrc + '" style="width:24px;height:24px;"></img>');
             }
     });
 }
 
 function generateOrgUUID() {
     $.ajax({
-        url:'/admin/organisations/generateuuid.json',
+        url: baseurl + '/admin/organisations/generateuuid.json',
         success:
             function( data ){
                 $('#OrganisationUuid').val(data.uuid);
@@ -2677,13 +2677,13 @@ function freetextImportResultsSubmit(id, count) {
     $.ajax({
         type: "post",
         cache: false,
-        url: "/events/saveFreeText/" + id,
+        url: baseurl + "/events/saveFreeText/" + id,
         data: formData,
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
         success:function (data, textStatus) {
-            window.location = '/events/view/' + id;
+            window.location = baseurl + '/events/view/' + id;
         },
         complete:function() {
             $(".loading").hide();
@@ -2856,13 +2856,13 @@ function moduleResultsSubmit(id) {
     $.ajax({
         type: "post",
         cache: false,
-        url: "/events/handleModuleResults/" + id,
+        url: baseurl + "/events/handleModuleResults/" + id,
         data: formData,
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
         success:function (data, textStatus) {
-            window.location = '/events/view/' + id;
+            window.location = baseurl + '/events/view/' + id;
         },
         complete:function() {
             $(".loading").hide();
@@ -2871,7 +2871,7 @@ function moduleResultsSubmit(id) {
 }
 
 function objectTemplateViewContent(context, id) {
-    var url = "/objectTemplateElements/viewElements/" + id + "/" + context;
+    var url = baseurl + "/objectTemplateElements/viewElements/" + id + "/" + context;
     $.ajax({
             url: url,
             type:'GET',
@@ -2893,15 +2893,15 @@ function objectTemplateViewContent(context, id) {
 
 function organisationViewContent(context, id) {
     organisationViewButtonHighlight(context);
-    var action = "/organisations/landingpage/";
+    var action = baseurl + "/organisations/landingpage/";
     if (context == 'members') {
-        action = "/admin/users/index/searchorg:";
+        action = baseurl + "/admin/users/index/searchorg:";
     }
     if (context == 'events') {
-        action = "/events/index/searchorg:";
+        action = baseurl + "/events/index/searchorg:";
     }
     $.ajax({
-        url: action + id,
+        url: baseurl + action + id,
         type:'GET',
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
@@ -3054,10 +3054,10 @@ function sharingGroupPopulateUsers() {
 function sharingGroupAdd(context, type) {
     if (context == 'organisation') {
         var jsonids = JSON.stringify(orgids);
-        url = '/organisations/fetchOrgsForSG/' + jsonids + '/' + type
+        url = baseurl + '/organisations/fetchOrgsForSG/' + jsonids + '/' + type
     } else if (context == 'server') {
         var jsonids = JSON.stringify(serverids);
-        url = '/servers/fetchServersForSG/' + jsonids
+        url = baseurl + '/servers/fetchServersForSG/' + jsonids
     }
     $("#gray_out").fadeIn();
     simplePopup(url);
@@ -3289,7 +3289,7 @@ function getRemoteSyncUser(id) {
 
 function testConnection(id) {
     $.ajax({
-        url: '/servers/testConnection/' + id,
+        url: baseurl + '/servers/testConnection/' + id,
         type:'GET',
         beforeSend: function (XMLHttpRequest) {
             $("#connection_test_" + id).html('Running test...');
@@ -3418,13 +3418,13 @@ function gpgSelect(fingerprint) {
 
 function lookupPGPKey(emailFieldName) {
     var email = $('#' + emailFieldName).val();
-    simplePopup("/users/searchGpgKey/" + email);
+    simplePopup(baseurl + "/users/searchGpgKey/" + email);
 }
 
 function zeroMQServerAction(action) {
     $.ajax({
         type: "get",
-        url: "/servers/" + action + "ZeroMQServer/",
+        url: baseurl + "/servers/" + action + "ZeroMQServer/",
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -3617,7 +3617,7 @@ function syncUserSelected() {
 }
 
 function filterAttributes(filter, id) {
-    url = "/events/viewEventAttributes/" + id;
+    url = baseurl + "/events/viewEventAttributes/" + id;
     if(filter === 'value'){
         filter = encodeURIComponent($('#quickFilterField').val().trim());
         url += filter.length > 0 ? "/searchFor:" + filter : "";
@@ -3777,7 +3777,7 @@ function runHoverLookup(type, id) {
             currentPopover = type + '_' + id + '_container'
         },
         cache: false,
-        url:"/attributes/hoverEnrichment/" + id,
+        url: baseurl + "/attributes/hoverEnrichment/" + id,
     });
 }
 
@@ -3801,7 +3801,7 @@ $(document).on( "click", ".eventViewAttributePopup", function() {
             },
             async: false,
             cache: false,
-            url:"/attributes/hoverEnrichment/" + id + "/1",
+            url: baseurl + "/attributes/hoverEnrichment/" + id + "/1",
         });
     }
     if (type + "_" + id in ajaxResults["persistent"]) {
@@ -3882,7 +3882,7 @@ function serverOwnerOrganisationChange(host_org_id) {
 }
 
 function requestAPIAccess() {
-    url = "/users/request_API/";
+    url = baseurl + "/users/request_API/";
     $.ajax({
         type:"get",
         url:url,
@@ -4026,7 +4026,7 @@ function checkOrphanedAttributes() {
         },
         type:"get",
         cache: false,
-        url: "/attributes/checkOrphanedAttributes/",
+        url: baseurl + "/attributes/checkOrphanedAttributes/",
     });
 }
 
@@ -4049,7 +4049,7 @@ function checkAttachments() {
         },
         type:"get",
         cache: false,
-        url: "/attributes/checkAttachments/",
+        url: baseurl + "/attributes/checkAttachments/",
     });
 }
 
@@ -4067,7 +4067,7 @@ function loadTagTreemap() {
         },
         type:"get",
         cache: false,
-        url: "/users/tagStatisticsGraph",
+        url: baseurl + "/users/tagStatisticsGraph",
     });
 }
 
@@ -4085,7 +4085,7 @@ function quickEditEvent(id, field) {
         },
         type:"get",
         cache: false,
-        url: "/events/quickEdit/" + id + "/" + field,
+        url: baseurl + "/events/quickEdit/" + id + "/" + field,
     });
 }
 
@@ -4137,7 +4137,7 @@ function quickSubmitGalaxyForm(cluster_ids, additionalData) {
     var target_id = additionalData['target_id'];
     var scope = additionalData['target_type'];
     var local = additionalData['local'];
-    var url = "/galaxies/attachMultipleClusters/" + target_id + "/" + scope + "/local:" + local;
+    var url = baseurl + "/galaxies/attachMultipleClusters/" + target_id + "/" + scope + "/local:" + local;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #GalaxyTargetIds').val(JSON.stringify(cluster_ids));
@@ -4183,7 +4183,7 @@ function checkAndSetPublishedInfo(skip_reload) {
     }
     var id = $('#hiddenSideMenuData').data('event-id');
     if (id !== 'undefined' && !skip_reload) {
-        $.get( "/events/checkPublishedStatus/" + id, function(data) {
+        $.get(baseurl + "/events/checkPublishedStatus/" + id, function(data) {
             if (data == 1) {
                 $('.published').removeClass('hidden');
                 $('.not-published').addClass('hidden');
@@ -4216,7 +4216,7 @@ function closeScreenshot() {
 }
 
 function loadSightingGraph(id, scope) {
-    $.get( "/sightings/viewSightings/" + id + "/" + scope, function(data) {
+    $.get(baseurl + "/sightings/viewSightings/" + id + "/" + scope, function(data) {
         $("#sightingsData").html(data);
     });
 }
@@ -4235,7 +4235,7 @@ function checkRolePerms() {
 }
 
 function updateMISP() {
-    $.get( "/servers/update", function(data) {
+    $.get(baseurl + "/servers/update", function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
     });
@@ -4259,7 +4259,7 @@ function submitMISPUpdate() {
         },
         type:"post",
         cache: false,
-        url:"/servers/update",
+        url: baseurl + "/servers/update",
     });
 }
 
@@ -4305,7 +4305,7 @@ function submitSubmoduleUpdate(clicked) {
                 url:$form.attr('action'),
             });
         },
-        url:'/servers/getSubmoduleQuickUpdateForm/' + (submodule_path !== undefined ? btoa(submodule_path) : ''),
+        url: baseurl + '/servers/getSubmoduleQuickUpdateForm/' + (submodule_path !== undefined ? btoa(submodule_path) : ''),
     });
 }
 
@@ -4449,7 +4449,7 @@ function previewEventBasedOnUuids(currentValue) {
         $('#event_preview').hide();
     } else {
         $.ajax({
-            url: "/events/getEventInfoById/" + currentValue,
+            url: baseurl + "/events/getEventInfoById/" + currentValue,
             type: "get",
             error: function(xhr) {
                 $('#event_preview').hide();
@@ -4478,7 +4478,7 @@ function checkNoticeList(type) {
                     $('#notice_message').append(
                         $('<div/>')
                             .append($('<span/>').text('['))
-                            .append($('<a/>', {href: '/noticelists/view/' + notice['list_id'], class:'bold'}).text(notice['list_name']))
+                            .append($('<a/>', {href: baseurl + '/noticelists/view/' + notice['list_id'], class:'bold'}).text(notice['list_name']))
                             .append($('<span/>').text(']: '))
                             .append($('<span/>').text(notice['message']['en']))
                     );
@@ -4541,7 +4541,7 @@ $(document).ready(function() {
             },
             type:"get",
             cache: false,
-            url: '/admin/roles/set_default/' + (state ? id : ""),
+            url: baseurl + '/admin/roles/set_default/' + (state ? id : ""),
         });
     });
     // clicking on an element with this class will select all of its contents in a
@@ -4572,7 +4572,7 @@ $(document).ready(function() {
         var k = $('#last-row').data('last-row');
         var k = k+1;
         $('#last-row').data('last-row', k);
-        url = "/objects/get_row/" + template_id + "/" + object_relation + "/" + k;
+        url = baseurl + "/objects/get_row/" + template_id + "/" + object_relation + "/" + k;
         $.get(url, function(data) {
             $('#row_' + object_relation + '_expand').before($(data).fadeIn()).html();
             var $added_row = $('#row_' + object_relation + '_expand').prev().prev();
@@ -4597,7 +4597,7 @@ $("body").on("click", ".correlation-expand-button", function() {
 function queryEventLock(event_id, user_org_id) {
     if (tabIsActive) {
         $.ajax({
-            url: "/events/checkLocks/" + event_id,
+            url: baseurl + "/events/checkLocks/" + event_id,
             type: "get",
             success: function(data, statusText, xhr) {
                  if (xhr.status == 200) {
@@ -4616,7 +4616,7 @@ function queryEventLock(event_id, user_org_id) {
 
 function checkIfLoggedIn() {
     if (tabIsActive) {
-        $.get("/users/checkIfLoggedIn.json")
+        $.get(baseurl + "/users/checkIfLoggedIn.json")
             .fail(function (xhr) {
                 if (xhr.status === 403) {
                     window.location.replace(baseurl + "/users/login");
@@ -4827,14 +4827,14 @@ function submit_feed_overlap_tool(feedId) {
         },
         type:"post",
         cache: false,
-        url:"/feeds/feedCoverage/" + feedId,
+        url: baseurl + "/feeds/feedCoverage/" + feedId,
     });
 }
 
 function changeTaxonomyRequiredState(checkbox) {
     var checkbox_state = $(checkbox).is(":checked");
     var taxonomy_id = $(checkbox).data('taxonomy-id');
-    fetchFormDataAjax('/taxonomies/toggleRequired/' + taxonomy_id, function(formData) {
+    fetchFormDataAjax(baseurl + '/taxonomies/toggleRequired/' + taxonomy_id, function(formData) {
         $.ajax({
             data: $(formData).serialize(),
             success:function (data, textStatus) {
@@ -4847,7 +4847,7 @@ function changeTaxonomyRequiredState(checkbox) {
             async:"false",
             type:"post",
             cache: false,
-            url: '/taxonomies/toggleRequired/' + taxonomy_id,
+            url: baseurl + '/taxonomies/toggleRequired/' + taxonomy_id,
         });
     });
 }
diff --git a/app/webroot/js/restClient.js b/app/webroot/js/restClient.js
index 43c51d13e..a153ab741 100644
--- a/app/webroot/js/restClient.js
+++ b/app/webroot/js/restClient.js
@@ -16,7 +16,7 @@ function setApiInfoBox(isTyping) {
             function() {
                 $.ajax({
                     type: "POST",
-                    url: '/servers/getApiInfo',
+                    url: baseurl + '/servers/getApiInfo',
                     data: payload,
                     success:function (data, textStatus) {
                         $('#apiInfo').html(data);
@@ -54,7 +54,7 @@ function populate_rest_history(scope) {
         scope = '1';
         var container_class = 'bookmarked_queries';
     }
-    $.get("/rest_client_history/index/" + scope, function(data) {
+    $.get(baseurl + "/rest_client_history/index/" + scope, function(data) {
         $('.' + container_class).html(data);
     });
 }
@@ -79,7 +79,7 @@ function removeRestClientHistoryItem(id) {
         },
         type:"post",
         cache: false,
-        url: '/rest_client_history/delete/' + id,
+        url: baseurl + '/rest_client_history/delete/' + id,
     });
 }
 
diff --git a/app/webroot/shortcuts/global_menu.json b/app/webroot/shortcuts/global_menu.json
index 7e3f66d13..8e8b6bffb 100644
--- a/app/webroot/shortcuts/global_menu.json
+++ b/app/webroot/shortcuts/global_menu.json
@@ -3,12 +3,12 @@
 		{
 			"key": "l",
 			"description": "Go to event list",
-			"action": "document.location.href = '/events/index'"
+			"action": "document.location.href = baseurl + '/events/index'"
 		},
 		{
 			"key": "e",
 			"description": "Go to add event page",
-			"action": "document.location.href = '/events/add'"
+			"action": "document.location.href = baseurl + '/events/add'"
 		}
 	]
-}
\ No newline at end of file
+}