diff --git a/app/models/conference.rb b/app/models/conference.rb
index 7e7e48dc..9faab764 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -122,13 +122,7 @@ class Conference < ActiveRecord::Base
   # * +false+ -> If the user is registered
   # * +true+ - If the user isn't registered
   def user_registered? user
-    return false if user.nil?
-
-    if registrations.where(user_id: user.id).count == 0
-      return false
-    else
-      return true
-    end
+    user.present? && registrations.where(user_id: user.id).count > 0
   end
 
   ##
diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb
index b76703b6..a0a5576e 100755
--- a/spec/models/conference_spec.rb
+++ b/spec/models/conference_spec.rb
@@ -1463,6 +1463,12 @@ describe Conference do
       end
     end
 
+    context 'user is nil' do
+      it '#user_registered? is false' do
+        expect(subject.user_registered? user).to be false
+      end
+    end
+
     context 'user registered' do
       before do
         registration = create(:registration)