Index: lams_central/web/profile.jsp
===================================================================
diff -u -re6da30ccffaf4fa9ef768a374711746e2aa3b452 -rab495e46efd059acbc6386c3d05a9b2fc7ff6dff
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision e6da30ccffaf4fa9ef768a374711746e2aa3b452)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision ab495e46efd059acbc6386c3d05a9b2fc7ff6dff)
@@ -5,6 +5,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" %>
 
 <script language="JavaScript" type="text/javascript"
 	src="includes/javascript/prototype.js"></script>
@@ -41,13 +42,17 @@
 
 		<td rowspan="3" class="userpage-td" valign="top">
 		<ul>
+			<c:set var="authenticationMethodId"><lams:user property="authenticationMethodId"/></c:set>
+			<c:set var="dbId"><%= AuthenticationMethod.DB %></c:set>
+			<c:if test="${authenticationMethodId eq dbId}">
 			<li class="no-list-type"><a
 				href="index.do?state=active&tab=editprofile"><fmt:message
 				key="title.profile.edit.screen" /> </a></li>
 
 			<li class="no-list-type"><a
 				href="index.do?state=active&tab=password"><fmt:message
 				key="title.password.change.screen" /></a></li>
+			</c:if>
 
 			<li class="no-list-type"><a
 				href="index.do?state=active&tab=portrait"><fmt:message
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r33ea91d27c610597a8ebc896dddcc289b0405b01 -rab495e46efd059acbc6386c3d05a9b2fc7ff6dff
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 33ea91d27c610597a8ebc896dddcc289b0405b01)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision ab495e46efd059acbc6386c3d05a9b2fc7ff6dff)
@@ -723,7 +723,9 @@
 							this.email,
 							new CSSThemeBriefDTO(this.flashTheme),
 							new CSSThemeBriefDTO(this.htmlTheme),
-							TimeZone.getTimeZone("Australia/Sydney"));
+							//TimeZone.getTimeZone("Australia/Sydney"),
+							TimeZone.getDefault(),
+							this.authenticationMethod.getAuthenticationMethodId());
     }
 	
     public UserFlashDTO getUserFlashDTO() {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rab495e46efd059acbc6386c3d05a9b2fc7ff6dff
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision ab495e46efd059acbc6386c3d05a9b2fc7ff6dff)
@@ -44,6 +44,7 @@
     private CSSThemeBriefDTO flashTheme;
     private CSSThemeBriefDTO htmlTheme;
     private TimeZone timeZone;
+    private Integer authenticationMethodId;
 
 //	public UserDTO(Integer userID, String firstName, String lastName,
 //			String login, String email, CSSThemeVisualElement theme) {		
@@ -58,7 +59,7 @@
 	public UserDTO(Integer userID, String firstName, String lastName,
 			String login, String localeLanguage,  String localeCountry, String direction, 
 			String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme,
-			TimeZone timezone) {		
+			TimeZone timezone, Integer authenticationMethodId) {		
 		this.userID = userID;
 		this.firstName = firstName;
 		this.lastName = lastName;
@@ -70,6 +71,7 @@
 		this.flashTheme = flashTheme;
 		this.htmlTheme = htmlTheme;
 		this.timeZone = timezone;
+		this.authenticationMethodId = authenticationMethodId;
 	}
 	
 	/**
@@ -160,6 +162,10 @@
 		return timeZone;
 	}
 	
+	public Integer getAuthenticationMethodId() {
+		return authenticationMethodId;
+	}
+	
 	public String toString() {
 		return new ToStringBuilder(this)
 			.append("userID", getUserID())
@@ -173,6 +179,7 @@
 			.append("flashTheme", getFlashTheme())
 			.append("htmlTheme", getHtmlTheme())
 			.append("timeZone", getTimeZone())
+			.append("authenticationMethodId", getAuthenticationMethodId())
 			.toString();
 	}