diff --git a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
index 8a5c1ad..f75a704 100644
--- a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
+++ b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
@@ -222,7 +222,10 @@
         driver.findElement( By.name( GlobalIds.LOGIN ) ).click();
 
         // TODO: Determine why the previous step causes 'unexpected system error' worked around by:
-        driver.findElement( By.name( "return" ) ).click();
+        if ( driver.findElement( By.name( "return" )).isDisplayed() )
+        {
+            driver.findElement( By.name( "return" ) ).click();
+        }
     }
 
     private void users()