diff --git a/build.properties b/build.properties
index a8a8203e77..85187de9d5 100644
--- a/build.properties
+++ b/build.properties
@@ -30,6 +30,16 @@ dspace.hostname = localhost
 # DSpace base host URL.  Include port number etc.
 dspace.baseUrl = http://localhost:8080
 
+# The user interface you will be using for DSpace. Common usage is either xmlui or jspui
+dspace.ui = xmlui
+
+# Full link your end users will use to access DSpace. In most cases, this will be the baseurl followed by
+# the context path to the UI you are using.
+#
+# Alternatively, you can use a url redirect or deploy the web application under the servlet container root.
+# In this case, make sure to remove the /${dspace.ui} from the dspace.url property.
+dspace.url = ${dspace.baseUrl}/${dspace.ui}
+
 # Name of the site
 dspace.name = DSpace at My University
 
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 1679f9cccd..3b9d14b875 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -36,7 +36,7 @@ dspace.baseUrl = ${dspace.baseUrl}
 # Change to xmlui if you wish to use the xmlui as the default, or remove
 # "/jspui" and set webapp of your choice as the "ROOT" webapp in
 # the servlet engine.
-dspace.url = ${dspace.baseUrl}/xmlui
+dspace.url = ${dspace.url}
 
 # Optional: DSpace URL for mobile access
 # This 
diff --git a/src/main/filters/testEnvironment.properties b/src/main/filters/testEnvironment.properties
index 0e552e07fc..b7920d1149 100644
--- a/src/main/filters/testEnvironment.properties
+++ b/src/main/filters/testEnvironment.properties
@@ -31,6 +31,16 @@ dspace.hostname = localhost
 # DSpace base host URL.  Include port number etc.
 dspace.baseUrl = http://localhost:8080
 
+# The user interface you will be using for DSpace. Common usage is either xmlui or jspui
+dspace.ui = xmlui
+
+# Full link your end users will use to access DSpace. In most cases, this will be the baseurl followed by
+# the context path to the UI you are using.
+#
+# Alternatively, you can use a url redirect or deploy the web application under the servlet container root.
+# In this case, make sure to remove the /${dspace.ui} from the dspace.url property.
+dspace.url = ${dspace.baseUrl}/${dspace.ui}
+
 # Name of the site
 dspace.name = DSpace at My University