Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9ab81eba5d1a95a6619094dfe12184f5580971e8 -r3571f54be7238b122a1654d2793c8b0dca0bbf37
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9ab81eba5d1a95a6619094dfe12184f5580971e8)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3571f54be7238b122a1654d2793c8b0dca0bbf37)
@@ -682,6 +682,6 @@
 user.import.password.change.email.content.start = Hi {0},
 user.import.password.change.email.content.account.created = We have created an account for you on LAMS platform. Your user name is "{0}". Please follow this link to set up your password: {1}
 user.import.password.change.email.content.link.label = SET UP LAMS PASSWORD
-user.import.password.change.email.content.end = If the link expired, please go to main page and click "Forgot password" link.
+user.import.password.change.email.content.end = If the link expired, please go to {0} and click "Forgot your password?" link.
 user.import.password.change.email.content.thanks = Thank you
 user.import.password.change.email.content.footer = LAMS
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r9ab81eba5d1a95a6619094dfe12184f5580971e8 -r3571f54be7238b122a1654d2793c8b0dca0bbf37
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 9ab81eba5d1a95a6619094dfe12184f5580971e8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 3571f54be7238b122a1654d2793c8b0dca0bbf37)
@@ -63,6 +63,7 @@
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -408,21 +409,26 @@
 		    messageService.getMessage("user.import.password.change.email.content.start",
 			    new Object[] { user.getFirstName() + " " + user.getLastName() }));
 
-	    StringBuilder link = new StringBuilder("<a href=\"").append(Configuration.get(ConfigurationKeys.SERVER_URL))
-		    .append("forgotPasswordChange.jsp?key=").append(key).append("\">")
+	    StringBuilder changePasswordLink = new StringBuilder("<a href=\"")
+		    .append(Configuration.get(ConfigurationKeys.SERVER_URL)).append("forgotPasswordChange.jsp?key=")
+		    .append(key).append("\">")
 		    .append(messageService.getMessage("user.import.password.change.email.content.link.label"))
 		    .append("</a>");
 
 	    placeholderStart = content.indexOf(USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_LINK_PLACEHOLDER);
 	    placeholderEnd = placeholderStart + USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_LINK_PLACEHOLDER.length();
 	    content.replace(placeholderStart, placeholderEnd,
 		    messageService.getMessage("user.import.password.change.email.content.account.created",
-			    new Object[] { user.getLogin(), link.toString() }));
+			    new Object[] { user.getLogin(), changePasswordLink.toString() }));
 
+	    String baseServerURL = WebUtil.getBaseServerURL();
+	    StringBuilder serverLink = new StringBuilder("<a href=\"").append(baseServerURL).append("\">")
+		    .append(baseServerURL).append("</a>");
+
 	    placeholderStart = content.indexOf(USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_END_PLACEHOLDER);
 	    placeholderEnd = placeholderStart + USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_END_PLACEHOLDER.length();
-	    content.replace(placeholderStart, placeholderEnd,
-		    messageService.getMessage("user.import.password.change.email.content.end"));
+	    content.replace(placeholderStart, placeholderEnd, messageService.getMessage(
+		    "user.import.password.change.email.content.end", new Object[] { serverLink.toString() }));
 
 	    placeholderStart = content.indexOf(USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_THANKS_PLACEHOLDER);
 	    placeholderEnd = placeholderStart + USER_IMPORT_PASSWORD_CHANGE_EMAIL_CONTENT_THANKS_PLACEHOLDER.length();
@@ -436,7 +442,7 @@
 
 	    boolean isHtmlFormat = true;
 
-	    // log.info(content.toString());
+	    log.info(content.toString());
 	    // send the email
 	    Emailer.sendFromSupportEmail(emailSubject, user.getEmail(), content.toString(), isHtmlFormat);
 	} catch (Exception e) {