diff --git a/resource/web/user_config.tmpl b/resource/web/user_config.tmpl
index 7837f88d..b99dc25f 100755
--- a/resource/web/user_config.tmpl
+++ b/resource/web/user_config.tmpl
@@ -12,6 +12,12 @@
                         <input type="text" class="form-control" id="username" name="username" value="{{user.getUsername()}}">
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="email" class="col-sm-2 control-label">Email:</label>
+                    <div class="col-sm-10">
+                        <input type="email" class="form-control" id="email" name="email" value="{{user.getEmail()}}">
+                    </div>
+                </div>
                 <div class="form-group">
                     <label for="address" class="col-sm-2 control-label">Address:</label>
                     <div class="col-sm-10">
diff --git a/src/se/hal/page/UserConfigHttpPage.java b/src/se/hal/page/UserConfigHttpPage.java
index 95b4fda3..6e8d9ece 100755
--- a/src/se/hal/page/UserConfigHttpPage.java
+++ b/src/se/hal/page/UserConfigHttpPage.java
@@ -40,6 +40,7 @@ public class UserConfigHttpPage extends HalHttpPage {
                         localUser.setExternal(false);
                     }
                     localUser.setUsername(request.get("username"));
+                    localUser.setEmail(request.get("email"));
                     localUser.setAddress(request.get("address"));
                     localUser.save(db);
                     break;
diff --git a/src/se/hal/struct/User.java b/src/se/hal/struct/User.java
index a711d187..67d79487 100755
--- a/src/se/hal/struct/User.java
+++ b/src/se/hal/struct/User.java
@@ -15,6 +15,7 @@ import java.util.List;
 public class User extends DBBean{
 
     private String username;
+    private String email;
     private String address;
     private int external;
 
@@ -62,6 +63,12 @@ public class User extends DBBean{
 	public void setUsername(String name) {
 		this.username = name;
 	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
 	public String getAddress() {
 		return address;
 	}