=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-04-01 09:23:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-04-01 10:19:39 +0000
@@ -13,10 +13,13 @@
  */
 function referrerBack( defaultUrl ) {
 	if(document.referrer !== undefined && document.referrer != "") {
-		location.href = document.referrer;
-	} else {
-		location.href = defaultUrl;
+		if(document.referrer.indexOf("login.html") == -1) {
+			location.href = document.referrer;
+			return;
+		}
 	}
+
+	location.href = defaultUrl;
 }
 
 /**