diff --git a/app/controllers/client/domain_versions_controller.rb b/app/controllers/client/domain_versions_controller.rb
index f716b0a6e..adf4a75b0 100644
--- a/app/controllers/client/domain_versions_controller.rb
+++ b/app/controllers/client/domain_versions_controller.rb
@@ -1,4 +1,5 @@
 class Client::DomainVersionsController < ClientController
+  helper WhodunnitHelper
   before_action :set_domain, only: [:show]
 
   def index
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 0a7545bd0..cc3a3eaa7 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -71,16 +71,15 @@ class Domain < ActiveRecord::Base
 
   def create_version
     return true unless PaperTrail.enabled?
-    # We don't create a version unless domain is valid, is that a good idea?
     return true unless valid?
-    #return true if versions.try(:last).try(:snapshot) == create_snapshot
     touch_with_version if new_version
   end
 
   def track_nameserver_add(nameserver)
-    # if we are not adding nameservers on create ( we don't care about ms so to_i )
-    #return true if versions.try(:last).try(:snapshot) == create_snapshot
-    touch_with_version if nameserver.created_at.to_i != created_at.to_i && valid? && new_version
+    return true unless valid? && new_version
+    ns_created = nameserver.created_at.to_i
+    return true if created_at.to_i.between?( ns_created, ns_created + 1 )
+    touch_with_version
   end
 
   def create_snapshot
diff --git a/app/views/client/domain_versions/show.haml b/app/views/client/domain_versions/show.haml
index a355dbd5c..debc481e6 100644
--- a/app/views/client/domain_versions/show.haml
+++ b/app/views/client/domain_versions/show.haml
@@ -58,6 +58,7 @@
               %td
                 %p{ :style => 'font-size:x-small;' }
                   = l(version.created_at, format: :short)
-                  = version.whodunnit
-                  = version.event
+                  = whodunnit_with_protocol(version.whodunnit)
+                  =# version.whodunnit
+                  =# version.event
 
diff --git a/app/views/layouts/client.haml b/app/views/layouts/client.haml
index 5ea9ff1a2..5e220f78d 100644
--- a/app/views/layouts/client.haml
+++ b/app/views/layouts/client.haml
@@ -51,7 +51,7 @@
                 %li
                   = link_to t('shared.contact_list'), client_contacts_path
 
-            %li.dropdown
+            -# %li.dropdown
               %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
                 = t('shared.history')
                 %span.caret
diff --git a/spec/models/domain_version_spec.rb b/spec/models/domain_version_spec.rb
index 898ff7ac9..68fc2f189 100644
--- a/spec/models/domain_version_spec.rb
+++ b/spec/models/domain_version_spec.rb
@@ -65,10 +65,8 @@ describe DomainVersion do
 
     context 'when removing child' do
       it('has one domain version before events') { expect(DomainVersion.count).to eq(1) }
-      before(:each) { Domain.last.nameservers << Fabricate(:nameserver) }
 
       it 'contact creates a version' do
-        # FIXME: For some reason nameservers disappeared mid-test, but randomly stopped happening
         expect(DomainVersion.count).to eq(1)
         DomainContact.last.destroy
         expect(Domain.last.valid?).to be(true)