diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 097a31280..f0c528776 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,8 +7,6 @@ def logged_in
   end
 
   def show
-    respond_to do |format|
-      format.json { render json: current_user }
-    end
+    render json: current_user
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 00f16f4d6..3df19bde0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -90,4 +90,10 @@ def self.non_organizer
   def self.without_questionnaire
     non_organizer.left_outer_joins(:questionnaire).where(questionnaires: { id: nil })
   end
+
+  def as_json(options = {})
+    result = super
+    result['questionnaire_id'] = Questionnaire.where(user_id: id).any? ? Questionnaire.where(user_id: id).first.id : nil
+    result
+  end
 end