Merge branch 'develop' into feature/only_lower_case_aliases

2 files changed, 5 insertions, 1 deletions

diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index 01a1a2f..03a5a62 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -31,7 +31,7 @@ module V1
     protected
 
     def account
-      Account.new(@user)
+      @user.account
     end
 
   end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 310eecd..a14fcb5 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -82,6 +82,10 @@ class User < CouchRest::Model::Base
     identity.keys[:pgp]
   end
 
+  def account
+    Account.new(self)
+  end
+
   def identity
     @identity ||= Identity.for(self)
   end