diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
index 87bd44fea2..18cac66bdb 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
@@ -564,7 +564,11 @@ public class AuthenticationUtil
         	
         	// Return the path for which this request belongs too. Only urls
         	// for this path may be resumed.
-        	return interruptedRequest.getServletPath();
+        	if (interruptedRequest.getServletPath() == null || interruptedRequest.getServletPath().length() == 0) {
+                return interruptedRequest.getActualPath();
+            } else {
+        	    return interruptedRequest.getServletPath();
+            }
         }
         
         // No request was interrupted.
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java
index 0c1ff9e036..6f78a33fdb 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java
@@ -117,6 +117,14 @@ public class RequestInfo
     {
     	return this.servletPath;
     }
+
+    /**
+     * Return the servlet path that this request is for.
+     */
+    public String getActualPath()
+    {
+    	return this.pathInfo + ((queryString == null || queryString.length() == 0) ? "" : "?"+queryString);
+    }
     
     /**
      * Wrap an incoming request to make it look like the request that the
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 2fda88cea7..47ce554726 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -18,6 +18,7 @@
 
 (Ben Bosman)
  - [DS-538] restricted items are being returned in OAI GetRecord method while using harvest.includerestricted.oai
+ - [DS-493] Url in browser is incorrect after login
 
 1.6.0 final
 ===========