Index: lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
===================================================================
diff -u -rb7c9e73e8708ec349c247443d5b1890aa356be0c -raa363014fb6368d1d27c91eb638b09ef34e6e143
--- lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java	(.../AbstractSeleniumTestCase.java)	(revision b7c9e73e8708ec349c247443d5b1890aa356be0c)
+++ lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java	(.../AbstractSeleniumTestCase.java)	(revision aa363014fb6368d1d27c91eb638b09ef34e6e143)
@@ -333,12 +333,23 @@
 
     /** */
     protected void loginToLams() throws Exception {
+	//prevent popup window for user logging in for the first time
+	//may be move to setUp()
+	User user = userManagementService.getUserByLogin(TestFrameworkConstants.USER_LOGIN);
+	if (user.isFirstLogin()) {
+	    user.setFirstLogin(false);
+	    Workspace workspace = (Workspace) activityDAO.find(Workspace.class, user.getWorkspace().getWorkspaceId());
+	    user.setWorkspace(workspace);
+	    userManagementService.save(user);
+	}
+	
 	selenium.open(TestFrameworkConstants.WEB_APP_DIR);
 	selenium.type("j_username", TestFrameworkConstants.USER_LOGIN);
 	selenium.type("j_password", TestFrameworkConstants.USER_PASSWORD);
 	selenium.click("link=Login");
 	selenium.waitForPageToLoad("10000");
 	Thread.sleep(3000);
+
     }
 
     // *****************************************************************************