Fix CC issues

app/controllers/registrar/sessions_controller.rb

@@ -161,12 +161,10 @@ class Registrar
 
       possible_users = ApiUser.where(identity_code: idc) || User.new
       possible_users.each do |selected_user|
-        next unless selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
-
-        return selected_user
+        if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
+          return selected_user
+        end
       end
-
-      User.new
     end
 
     def check_ip_restriction

app/models/bounced_mail_address.rb

@@ -4,25 +4,26 @@ class BouncedMailAddress < ApplicationRecord
   before_validation :assign_bounce_reason
 
   def assign_bounce_reason
-    if recipient_json
-      self.bounce_reason = "#{action} (#{status} #{diagnostic})"
-    else
-      self.bounce_reason = nil
-    end
+    return self.bounce_reason = nil unless recipient_json
+
+    self.bounce_reason = "#{action} (#{status} #{diagnostic})"
   end
 
   def diagnostic
-    return nil unless recipient_json
+    return unless recipient_json
+
     recipient_json['diagnosticCode']
   end
 
   def action
-    return nil unless recipient_json
+    return unless recipient_json
+
     recipient_json['action']
   end
 
   def status
-    return nil unless recipient_json
+    return unless recipient_json
+
     recipient_json['status']
   end