diff --git a/app/controllers/admin/nameservers_controller.rb b/app/controllers/admin/nameservers_controller.rb
index d2bcc3e94..671a78628 100644
--- a/app/controllers/admin/nameservers_controller.rb
+++ b/app/controllers/admin/nameservers_controller.rb
@@ -10,12 +10,18 @@ class Admin::NameserversController < ApplicationController
   def create
     @domain = Domain.find(params[:domain_id])
 
-    if @domain.can_add_nameserver?
-      @domain.nameservers.build(nameserver_params)
-      flash[:notice] = I18n.t('shared.nameserver_added')
-      redirect_to [:admin, @domain] and return if @domain.save
-    else
+    unless @domain.can_add_nameserver?
       @nameserver = @domain.nameservers.build(nameserver_params)
+      flash.now[:alert] = I18n.t('shared.failed_to_add_nameserver')
+      render 'new' and return
+    end
+
+    @domain.nameservers.build(nameserver_params)
+
+    if @domain.save
+      flash[:notice] = I18n.t('shared.nameserver_added')
+      redirect_to [:admin, @domain]
+    else
       flash.now[:alert] = I18n.t('shared.failed_to_add_nameserver')
       render 'new'
     end
diff --git a/app/controllers/admin/tech_contacts_controller.rb b/app/controllers/admin/tech_contacts_controller.rb
index f3c883ea1..f80554dbe 100644
--- a/app/controllers/admin/tech_contacts_controller.rb
+++ b/app/controllers/admin/tech_contacts_controller.rb
@@ -2,9 +2,7 @@ class Admin::TechContactsController < ApplicationController
   before_action :set_domain
   before_action :set_contact, only: [:destroy]
 
-  def new
-
-  end
+  def new; end
 
   def create
     contact = Contact.find_by(id: params[:tech_contact_id])