diff --git a/resource/web/main_index.tmpl b/resource/web/main_index.tmpl
index 1d98a785..d77ac16a 100755
--- a/resource/web/main_index.tmpl
+++ b/resource/web/main_index.tmpl
@@ -76,8 +76,8 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li>
-                            <div align="center" style="font-size: 110px;height: 120px;">
-                                <span class="glyphicon glyphicon-user"></span>
+                            <div align="center">
+                                <img src="{{user.getAvatarUrl()}}" />
                             </div>
                         </li>
                         <li class="divider"></li>
diff --git a/resource/web/user_config.tmpl b/resource/web/user_config.tmpl
index b99dc25f..d89ecb2c 100755
--- a/resource/web/user_config.tmpl
+++ b/resource/web/user_config.tmpl
@@ -6,6 +6,13 @@
         <div class="panel-body">
             <form class="form-horizontal" method="POST">
                 <input type="hidden" name="action" value="modify_local_user">
+
+                <div class="form-group">
+                <div class="col-sm-offset-2 col-sm-10">
+                    <img src="{{user.getLargeAvatarUrl()}}" />
+                </div>
+                    </div>
+
                 <div class="form-group">
                     <label for="username" class="col-sm-2 control-label">Username:</label>
                     <div class="col-sm-10">
diff --git a/src/se/hal/struct/User.java b/src/se/hal/struct/User.java
index 67d79487..8b3d3387 100755
--- a/src/se/hal/struct/User.java
+++ b/src/se/hal/struct/User.java
@@ -1,5 +1,6 @@
 package se.hal.struct;
 
+import zutil.api.Gravatar;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
@@ -69,6 +70,12 @@ public class User extends DBBean{
 	public void setEmail(String email) {
 		this.email = email;
 	}
+	public String getAvatarUrl(){
+		return Gravatar.getImageUrl(email, 130);
+	}
+	public String getLargeAvatarUrl(){
+		return Gravatar.getImageUrl(email, 250);
+	}
 	public String getAddress() {
 		return address;
 	}