diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
index 2f12258c28..3797cbd600 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
@@ -220,7 +220,7 @@ public class ControlPanel extends AbstractDSpaceTransformer implements Serviceab
         pageMeta.addMetadata("title").addContent(T_title);
 
         pageMeta.addTrailLink(contextPath + "/", T_DSPACE_HOME);
-        pageMeta.addTrailLink(contextPath + "/admin/panel", T_trail);
+        pageMeta.addTrailLink(null, T_trail);
     }
 
     @Override
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/AuthorizationMain.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/AuthorizationMain.java
index 87a2a02446..e09b771984 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/AuthorizationMain.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/AuthorizationMain.java
@@ -69,7 +69,7 @@ public class AuthorizationMain extends AbstractDSpaceTransformer
     {
         pageMeta.addMetadata("title").addContent(T_title);
         pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
-        pageMeta.addTrailLink(contextPath + "/admin/authorize", T_authorize_trail);
+        pageMeta.addTrailLink(null, T_authorize_trail);
     }
 	
 	public void addBody(Body body) throws WingException, SQLException 
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/ManageEPeopleMain.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/ManageEPeopleMain.java
index 2d3793e7db..683880df1d 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/ManageEPeopleMain.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/ManageEPeopleMain.java
@@ -106,7 +106,7 @@ public class ManageEPeopleMain extends AbstractDSpaceTransformer
     {
         pageMeta.addMetadata("title").addContent(T_title);
         pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
-        pageMeta.addTrailLink(contextPath + "/admin/epeople",T_eperson_trail);
+        pageMeta.addTrailLink(null,T_eperson_trail);
     }
 		
 	
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/ManageGroupsMain.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/ManageGroupsMain.java
index 40f27c4b6f..611590bfe1 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/ManageGroupsMain.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/ManageGroupsMain.java
@@ -112,7 +112,7 @@ public class ManageGroupsMain extends AbstractDSpaceTransformer
     {
         pageMeta.addMetadata("title").addContent(T_title);
         pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
-        pageMeta.addTrailLink(contextPath + "/admin/groups",T_group_trail);
+        pageMeta.addTrailLink(null,T_group_trail);
     }
 		
 	public void addBody(Body body) throws WingException, SQLException 
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/FormatRegistryMain.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/FormatRegistryMain.java
index 26195f3a7c..0a62484f92 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/FormatRegistryMain.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/FormatRegistryMain.java
@@ -69,7 +69,7 @@ public class FormatRegistryMain extends AbstractDSpaceTransformer
     {
         pageMeta.addMetadata("title").addContent(T_title);
         pageMeta.addTrailLink(contextPath + "/",T_dspace_home);
-        pageMeta.addTrailLink(contextPath + "/admin/format-registry",T_format_registry_trail);
+        pageMeta.addTrailLink(null,T_format_registry_trail);
     }
 	
 	
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/MetadataRegistryMain.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/MetadataRegistryMain.java
index 7d20fca8e3..0e553af167 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/MetadataRegistryMain.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/MetadataRegistryMain.java
@@ -78,7 +78,7 @@ public class MetadataRegistryMain extends AbstractDSpaceTransformer
     {
         pageMeta.addMetadata("title").addContent(T_title);
         pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
-        pageMeta.addTrailLink(contextPath + "/admin/metadata-registry",T_metadata_registry_trail);
+        pageMeta.addTrailLink(null,T_metadata_registry_trail);
     }
 		
 	
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/Submissions.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/Submissions.java
index fa3f27086e..53fb260a20 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/Submissions.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/Submissions.java
@@ -115,7 +115,7 @@ public class Submissions extends AbstractDSpaceTransformer
 		pageMeta.addMetadata("title").addContent(T_title);
 
 		pageMeta.addTrailLink(contextPath + "/",T_dspace_home);
-		pageMeta.addTrailLink(contextPath + "/submissions",T_trail);
+		pageMeta.addTrailLink(null,T_trail);
 	}
 	
     @Override