diff --git a/app/models/channel/email_build.rb b/app/models/channel/email_build.rb
index e801b7547..8633e952e 100644
--- a/app/models/channel/email_build.rb
+++ b/app/models/channel/email_build.rb
@@ -20,7 +20,7 @@ module Channel::EmailBuild
 
     # set organization
     organization = Setting.get('organization')
-    if organization then
+    if organization
       mail['Organization'] = organization.to_s
     end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 743ec0a8c..198287fcb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -245,7 +245,7 @@ returns
 
   def self.create_from_hash!(hash)
     url = ''
-    if hash['info']['urls'] then
+    if hash['info']['urls']
       url = hash['info']['urls']['Website'] || hash['info']['urls']['Twitter'] || ''
     end
     roles = Role.where( name: 'Customer' )