diff --git a/app/controllers/domains_controller.rb b/app/controllers/domains_controller.rb
index 46a0f16..6ca9d25 100644
--- a/app/controllers/domains_controller.rb
+++ b/app/controllers/domains_controller.rb
@@ -27,9 +27,13 @@ class DomainsController < ApplicationController
     scope = @server ? @server.domains : organization.domains
     @domain = scope.build(params.require(:domain).permit(:name, :verification_method))
 
+    if current_user.admin?
+      @domain.verification_method = 'DNS'
+      @domain.verified_at = Time.now
+    end
+
     if @domain.save
-      if @auto_verified
-        flash[:notice] = "Ownership of this domain does not need to be verified because it already has been verified in this organization."
+      if @domain.verified?
         redirect_to_with_json [:setup, organization, @server, @domain]
       else
         redirect_to_with_json [:verify, organization, @server, @domain]
diff --git a/app/models/domain.rb b/app/models/domain.rb
index c630ca9..498d579 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -50,13 +50,12 @@ class Domain < ApplicationRecord
 
   VERIFICATION_METHODS = ['DNS', 'Email']
 
-  validates :name, :presence => true, :format => {:with => /\A[a-z0-9\-\.]*\*?\z/}, :uniqueness => {:scope => [:owner_type, :owner_id], :message => "is already added"}
+  validates :name, :presence => true, :format => {:with => /\A[a-z0-9\-\.]*\z/}, :uniqueness => {:scope => [:owner_type, :owner_id], :message => "is already added"}
   validates :verification_method, :inclusion => {:in => VERIFICATION_METHODS}
 
   random_string :dkim_identifier_string, :type => :chars, :length => 6, :unique => true, :upper_letters_only => true
 
   before_create :generate_dkim_key
-  after_create :automatically_verify_domains_in_development
 
   scope :verified, -> { where.not(:verified_at => nil) }
 
@@ -72,15 +71,6 @@ class Domain < ApplicationRecord
     end
   end
 
-  def automatically_verify_domains_in_development
-    if Rails.env.development? && self.name && self.name =~ /\*\z/
-      self.name = self.name.gsub(/\*\z/, '')
-      self.verified_at = Time.now
-      self.verification_token = nil
-      self.save
-    end
-  end
-
   def verified?
     verified_at.present?
   end
diff --git a/app/views/domains/new.html.haml b/app/views/domains/new.html.haml
index d420821..474a2b0 100644
--- a/app/views/domains/new.html.haml
+++ b/app/views/domains/new.html.haml
@@ -22,14 +22,15 @@
       .fieldSet__field
         = f.label :name, :class => 'fieldSet__label'
         .fieldSet__input= f.text_field :name, :autofocus => true, :class => 'input input--text'
-      .fieldSet__field
-        = f.label :verification_method, :class => 'fieldSet__label'
-        .fieldSet__input
-          = f.select :verification_method, Domain::VERIFICATION_METHODS, {}, :class => 'input input--select'
-          .fieldSet__text
-            Choose how you'd like to verify your ownership of this domain. If you choose <b>E-Mail</b> we can send you
-            an email with a code whcih you'll need to enter - you can choose from a set of pre-defined addresses for
-            the domain. Using <b>DNS</b> you'll need to add a TXT record on this domain using your DNS provider.
+      - unless current_user.admin?
+        .fieldSet__field
+          = f.label :verification_method, :class => 'fieldSet__label'
+          .fieldSet__input
+            = f.select :verification_method, Domain::VERIFICATION_METHODS, {}, :class => 'input input--select'
+            .fieldSet__text
+              Choose how you'd like to verify your ownership of this domain. If you choose <b>E-Mail</b> we can send you
+              an email with a code whcih you'll need to enter - you can choose from a set of pre-defined addresses for
+              the domain. Using <b>DNS</b> you'll need to add a TXT record on this domain using your DNS provider.
 
     .fieldSetSubmit
       = f.submit :class => "button button--positive js-form-submit"