diff --git a/app/models/user.rb b/app/models/user.rb
index 7dbb366..a5b4638 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -115,7 +115,13 @@ class User < ActiveRecord::Base
     attrs.push :about
 
     h = super(:only => attrs)
-    h[:avatar_url] = avatar_url
+
+    h[:avatar_url] = self.avatar_url
+
+    if self.github_username.present?
+      h[:github_username] = self.github_username
+    end
+
     h
   end
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f9ee06a..9d91ec3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -115,6 +115,16 @@
   </span>
   <br>
 
+  <% if @showing_user.github_username.present? %>
+    <label class="required">GitHub:</label>
+
+    <span class="d">
+      <a href="https://github.com/<%= h(@showing_user.github_username)
+        %>">https://github.com/<%= h(@showing_user.github_username) %></a>
+    </span>
+    <br>
+  <% end %>
+
   <% if @showing_user.is_active? %>
     <label class="required"><%= t('.about') %></label>