diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/UpdateUserDetails.java b/teamengine-web/src/main/java/com/occamlab/te/web/UpdateUserDetails.java
new file mode 100644
index 000000000..14e373934
--- /dev/null
+++ b/teamengine-web/src/main/java/com/occamlab/te/web/UpdateUserDetails.java
@@ -0,0 +1,85 @@
+package com.occamlab.te.web;
+
+import java.io.File;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+public class UpdateUserDetails extends HttpServlet {
+
+  Config conf;
+  
+  public void init() throws ServletException {
+    conf = new Config();
+  }
+
+  public void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException {
+    process(request, response);
+  }
+
+  public void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException {
+    process(request, response);
+  }
+  
+  public void process(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException {
+
+    try {
+      String username = request.getRemoteUser();
+
+      String firstName = request.getParameter("firstName");
+      String lastName = request.getParameter("lastName");
+      String email = request.getParameter("email");
+      String organization = request.getParameter("organization");
+
+      File userDir = new File(conf.getUsersDir(), username);
+      if (!userDir.exists()) {
+        String msg = "error=userNotExists";
+        response.setContentType("text/plain");
+        response.setCharacterEncoding("UTF-8");
+        response.getWriter().write(msg);
+      } else {
+        File xmlfile = new File(userDir, "user.xml");
+        Document doc = XMLUtils.parseDocument(xmlfile);
+        Element userDetails = (Element) (doc.getElementsByTagName("user")
+            .item(0));
+          //FirstName
+          doc = XMLUtils.removeElement(doc, userDetails, "firstName");
+          Element firstNameElement = doc.createElement("firstName");
+          firstNameElement.setTextContent(firstName);
+          userDetails.appendChild(firstNameElement);
+          //LastName
+          doc = XMLUtils.removeElement(doc, userDetails, "lastName");
+          Element lastNameElement = doc.createElement("lastName");
+          lastNameElement.setTextContent(lastName);
+          userDetails.appendChild(lastNameElement);
+          //Update email
+          doc = XMLUtils.removeElement(doc, userDetails, "email");
+          Element emailElement = doc.createElement("email");
+          emailElement.setTextContent(email);
+          userDetails.appendChild(emailElement);
+          //Update organization
+          doc = XMLUtils.removeElement(doc, userDetails, "organization");
+          Element orgElement = doc.createElement("organization");
+          orgElement.setTextContent(organization);
+          userDetails.appendChild(orgElement);
+          
+          XMLUtils.transformDocument(doc, new File(userDir, "user.xml"));
+          
+          String msg = "success=detailsUpdated";
+          response.setContentType("text/plain");
+          response.setCharacterEncoding("UTF-8");
+          response.getWriter().write(msg);
+        }        
+      
+    } catch (Exception e) {
+      throw new ServletException(e);
+    }
+  }
+}
diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CheckUserProfileFilter.java b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CheckUserProfileFilter.java
new file mode 100644
index 000000000..6d5478902
--- /dev/null
+++ b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CheckUserProfileFilter.java
@@ -0,0 +1,96 @@
+package com.occamlab.te.web.listeners;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import com.occamlab.te.web.Config;
+import com.occamlab.te.web.XMLUtils;
+
+public class CheckUserProfileFilter implements Filter {
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+  }
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response,
+      FilterChain chain) throws IOException, ServletException {
+
+    HttpServletRequest req = (HttpServletRequest) request;
+    HttpServletResponse res = (HttpServletResponse) response;
+    String username = req.getRemoteUser();
+    Boolean updateUserPopup = false;
+
+    if (username != null) {
+      Config conf = new Config();
+      File userDir = new File(conf.getUsersDir(), username);
+      if (userDir.exists()) {
+        String fileName = "user.xml";
+        File xmlfile = new File(userDir, fileName);
+        Document doc = XMLUtils.parseDocument(xmlfile);
+        Element userDetails = (Element) (doc.getElementsByTagName("user")
+            .item(0));
+        HttpSession session = ((HttpServletRequest) request).getSession();
+        
+        // FirstName
+        NodeList firstNameList = userDetails.getElementsByTagName("firstName");
+        String firstName = "";
+        if (firstNameList.getLength() > 0) {
+          Element firstNameElement = (Element) firstNameList.item(0);
+          firstName = firstNameElement.getTextContent();
+        }
+        // LastName
+        NodeList lastNameList = userDetails.getElementsByTagName("firstName");
+        String lastName = "";
+        if (firstNameList.getLength() > 0) {
+          Element lastNameElement = (Element) lastNameList.item(0);
+          lastName = lastNameElement.getTextContent();
+        }
+        //Email
+        NodeList emailList = userDetails.getElementsByTagName("email");
+        String registeredEmail = "";
+        if (emailList.getLength() > 0) {
+          Element registeredEmailElement = (Element) emailList.item(0);
+          registeredEmail = registeredEmailElement.getTextContent();
+        }        
+        //Organization
+        NodeList organizationList = userDetails.getElementsByTagName("organization");
+        String registeredOrganization = "";
+        if (organizationList.getLength() > 0) {
+          Element registeredOrgElement = (Element) organizationList.item(0);
+          registeredOrganization = registeredOrgElement.getTextContent();
+        }
+        
+        if(firstName == "" || lastName == "" || registeredEmail == "" || registeredOrganization == ""){
+          updateUserPopup = true;
+        } 
+        
+        request.setAttribute("updateUserPopup",updateUserPopup);
+        request.setAttribute("u_firstName", firstName);
+        request.setAttribute("u_lastName", lastName);
+        request.setAttribute("u_email", registeredEmail);
+        request.setAttribute("u_organization", registeredOrganization);
+      }
+    }
+    chain.doFilter(request, response);
+  }
+
+  @Override
+  public void destroy() {
+  }
+
+}
diff --git a/teamengine-web/src/main/webapp/WEB-INF/web.xml b/teamengine-web/src/main/webapp/WEB-INF/web.xml
index a04083a28..cfb56e66e 100644
--- a/teamengine-web/src/main/webapp/WEB-INF/web.xml
+++ b/teamengine-web/src/main/webapp/WEB-INF/web.xml
@@ -19,6 +19,14 @@
   <filter-name>clearVerificationCode</filter-name>  
   <url-pattern>/viewSessions.jsp</url-pattern>  
   </filter-mapping>
+  <filter>  
+  <filter-name>CheckUserProfileFilter</filter-name>  
+  <filter-class>com.occamlab.te.web.listeners.CheckUserProfileFilter</filter-class>  
+  </filter>  
+  <filter-mapping>  
+  <filter-name>CheckUserProfileFilter</filter-name>  
+  <url-pattern>*.jsp</url-pattern>
+  </filter-mapping>
   <servlet>
     <servlet-name>test</servlet-name>
     <servlet-class>com.occamlab.te.web.TestServlet</servlet-class>
@@ -65,6 +73,10 @@
     <servlet-name>updateUserDetailsHandler</servlet-name>
     <servlet-class>com.occamlab.te.web.UpdateUserDetailsHandler</servlet-class>  
   </servlet>
+  <servlet>
+    <servlet-name>updateUserDetails</servlet-name>
+    <servlet-class>com.occamlab.te.web.UpdateUserDetails</servlet-class>  
+  </servlet>
   <servlet>
     <servlet-name>emailLog</servlet-name>
     <servlet-class>com.occamlab.te.web.EmailLogServlet</servlet-class>
@@ -140,6 +152,10 @@
     <servlet-name>updateUserDetailsHandler</servlet-name>
     <url-pattern>/updateUserDetailsHandler</url-pattern>
   </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>updateUserDetails</servlet-name>
+    <url-pattern>/updateUserDetails</url-pattern>
+  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>
diff --git a/teamengine-web/src/main/webapp/header.jsp b/teamengine-web/src/main/webapp/header.jsp
index 236a66c6e..35ede2751 100644
--- a/teamengine-web/src/main/webapp/header.jsp
+++ b/teamengine-web/src/main/webapp/header.jsp
@@ -29,21 +29,131 @@
 
 .dropdown:hover .dropdown-content {display: block;}
 
+.no-close .ui-dialog-titlebar-close { display: none }
+div.ui-dialog { position:fixed; } 
 </style>
+<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+<%
+String r_username = (String) request.getRemoteUser();
+String u_fname = (String) request.getAttribute("u_firstName");
+String u_lname = (String) request.getAttribute("u_lastName");
+String u_email = (String) request.getAttribute("u_email");
+String u_organization = (String) request.getAttribute("u_organization");
+%>
+
+<script>
+var status = '<%=request.getAttribute("updateUserPopup")%>';
+var r_username = '<%=r_username%>';
+
+$(function () {
+    var dialog, form,
+
+        emailRegex = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/,
+        fname = $("#FirstName"),
+        lname = $("#LastName"),
+        email = $("#Email"),
+        org = $("#Organization"),
+        allFields = $([]).add(fname).add(lname).add(email).add(org),
+        tips = $(".validateTips");
+
+    function updateTips(t) {
+        tips.text(t).addClass("ui-state-highlight");
+        setTimeout(function () {
+            tips.removeClass("ui-state-highlight", 1500);
+        }, 500);
+    }
+
+    function checkLength(o, n, min, max) {
+        if (o.val().length > max || o.val().length < min) {
+            o.addClass("ui-state-error");
+            updateTips("Length of " + n + " must be between " + min +
+                " and " + max + ".");
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function checkRegexp(o, regexp, n) {
+        if (!(regexp.test(o.val()))) {
+            o.addClass("ui-state-error");
+            updateTips(n);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function validateForm() {
+        var valid = true;
+        allFields.removeClass("ui-state-error");
+
+        valid = valid && checkLength(fname, "FirstName", 3, 16);
+        valid = valid && checkLength(lname, "LastName", 3, 16);
+        valid = valid && checkLength(org, "Organization", 3, 16);
+        valid = valid && checkRegexp(email, emailRegex, "Not a valid email");
+        
+        if(valid){
+        	updateUserDetails();
+        }
+    }
+    
+    function updateUserDetails() {
+        $.ajax({
+            type: "post",
+            url:  "updateUserDetails",
+            data: "firstName=" + fname + "&lastName=" + lname + "&email=" + email + "&organization=" + org,
+            success: function(msg){      
+            	$( "#dialog-form" ).dialog( "close" );
+            	setTimeout(function () {
+            		if(msg.includes("success")){
+                		alert("Details updated successfully!");
+                	}
+                }, 500);            	
+            }
+        });
+    }
+
+    dialog = $("#dialog-form").dialog({
+    	dialogClass: "no-close",
+		closeOnEscape: false,
+        autoOpen: false,
+        height: 400,
+        width: 450,
+        modal: true,
+        buttons: {
+            "Update": validateForm
+        }
+    });
+
+    form = dialog.find("form").on("submit", function (event) {
+        event.preventDefault();
+        validateForm();
+        updateUserDetails();
+    });
+
+    if (status == 'true') {
+        //Open dialog on page load.
+        dialog.dialog("open");
+    }
+});	
+</script>
 <div style="position: static">
 	<div
-		style="position: static; background-color: black; width: 100%; height: 100px; overflow: hidden"
-		>
+		style="position: static; background-color: black; width: 100%; height: 100px; overflow: hidden">
 		<!-- Image derived from "Dinky the Steam Engine - main drive wheel", Steve Karg, http://www.burningwell.org -->
 		<img style="position: absolute" src="images/banner.jpg" alt="TEAM Engine Banner" />
 		<div style="position: absolute;">
-      <div style="margin-bottom: 0.75em;"><img src="site/logo.png"/></div>
-      <%@include file="site/title.html" %>
+      	<div style="margin-bottom: 0.75em;"><img src="site/logo.png"/></div>
+      	<%@include file="site/title.html" %>
 		</div>
 		<%
 		    String user = request.getRemoteUser();
-                    Cookie userName=new Cookie("User", user);
-                    response.addCookie(userName);
+                    Cookie c_userName=new Cookie("User", user);
+                    response.addCookie(c_userName);
 		    if (user != null && user.length() > 0) {
 		        out.println("\t\t<div style=\"position: absolute; right:20px; top:25px; background-color: white; border-style: inset\">");
 		        out.println("<div class=\"dropdown\">");
@@ -57,7 +167,34 @@
 				
 		        out.println("\t\t</div>");
 		    }
-		%>
+		%>		
 	</div>
 <hr>
 </div>
+
+<div id="dialog-form" title="Update user details">
+	<p class="validateTips">All form fields are required.</p>
+	<form method="post" action="updateUserDetailsHandler">
+		<fieldset style="padding: 0; border: 0; margin-top: 25px; align: center;">
+			<table>
+				<tr>
+					<td>First Name:</td>
+					<td><input id="FirstName" name="FirstName" type="text" value="<%= u_fname == null ? "" : u_fname %>" /></td>
+				</tr>
+				<tr>
+					<td>Last Name:</td>
+					<td><input id="LastName" name="LastName" type="text" value="<%=  u_lname == null ? "" : u_lname %>" /></td>
+				</tr>
+				<tr>
+					<td>Email:</td>
+					<td><input id="Email" name="Email" type="text" value="<%= u_email == null ? "" : u_email %>" /></td>
+				</tr>
+				<tr>
+					<td>Organization:</td>
+					<td><input id="Organization" name="Organization" type="text" value="<%= u_organization == null ? "" : u_organization %>" /></td>
+				</tr>
+			</table>
+			<input type="submit" tabindex="-1" style="position: absolute; top: -1000px" />
+		</fieldset>
+	</form>
+</div>
diff --git a/teamengine-web/src/main/webapp/updateUserDetails.jsp b/teamengine-web/src/main/webapp/updateUserDetails.jsp
index 19e837450..a9ec64235 100644
--- a/teamengine-web/src/main/webapp/updateUserDetails.jsp
+++ b/teamengine-web/src/main/webapp/updateUserDetails.jsp
@@ -3,8 +3,8 @@
 	import="java.io.File, javax.xml.parsers.*, java.util.Arrays, com.occamlab.te.web.*, java.util.List, java.util.ArrayList"%>
 <%
 String username = request.getRemoteUser();
-String email = session.getAttribute("email").toString();
-String organization = session.getAttribute("organization").toString();
+String email = (String) session.getAttribute("email");
+String organization = (String) session.getAttribute("organization");
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">