diff --git a/app/models/user.rb b/app/models/user.rb
index ca5d552..9103a5e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,7 +58,7 @@
 
 
   validates :prefs, presence: true
-  before_create :create_default_preferences
+  before_validation :create_default_preferences
 
   ##
   # Scopes
@@ -283,7 +283,8 @@
   ##
   # User Notification Preferences
   def create_default_preferences
-    self.prefs = self.class.create_default_preferences
+    # Set the default preferences if this is a new user
+    self.prefs = self.class.create_default_preferences if self.id.nil?
   end
 
   def self.create_default_preferences
diff --git a/app/views/branding b/app/views/branding
deleted file mode 120000
index dd1660a..0000000
--- a/app/views/branding
+++ /dev/null
@@ -1 +0,0 @@
-/Users/briley/Documents/workspace/dmptool_config/app/views/branding/
\ No newline at end of file
diff --git a/test/functional/plans_controller_test.rb b/test/functional/plans_controller_test.rb
index 8507036..75708f2 100644
--- a/test/functional/plans_controller_test.rb
+++ b/test/functional/plans_controller_test.rb
@@ -74,7 +74,6 @@
     assert assigns(:orgs)
     assert assigns(:funders)
     assert assigns(:default_org)
-    assert assigns(:is_test)
   end
 
   # POST /plans (plans_path)
@@ -161,8 +160,7 @@
     post duplicate_plan_path(@plan, format: :js)
     @duplicate_plan = Plan.last
     assert_equal _('Plan was successfully duplicated.'), flash[:notice]
-    assert_response :redirect
-    assert_redirected_to plan_url(@duplicate_plan)
+    assert_response :success
     assert assigns(:plan)
     assert_equal 'Copy of Test Plan', @duplicate_plan.title, "Copy of"
   end