diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
index 20b7f94..606e75c 100644
--- a/app/controllers/themes_controller.rb
+++ b/app/controllers/themes_controller.rb
@@ -5,7 +5,7 @@ class ThemesController < ApplicationController
   no_design_blocks
 
   # attr_reader :target
-  
+
   def target
     @target
   end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index af15dff..ceebd6d 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -679,11 +679,13 @@ class Environment < ActiveRecord::Base
   end
 
   def update_theme(theme)
-    self.update_attribute(:theme, theme)
+    self.theme = theme
+    self.save!
   end
 
   def update_layout_template(template)
-    self.update_attribute(:layout_template, template)
+    self.layout_template = template
+    self.save!
   end
 
   before_create do |env|
diff --git a/test/functional/environment_themes_controller_test.rb b/test/functional/environment_themes_controller_test.rb
index a81f3df..2f3d110 100644
--- a/test/functional/environment_themes_controller_test.rb
+++ b/test/functional/environment_themes_controller_test.rb
@@ -96,7 +96,8 @@ class EnvironmentThemesControllerTest < ActionController::TestCase
 
   should 'display links to set template' do
     env = Environment.default
-    env.update_attributes!(:layout_template => 'rightbar')
+    env.layout_template = 'rightbar'
+    env.save!
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
     LayoutTemplate.expects(:all).returns([t1, t2])
@@ -109,6 +110,7 @@ class EnvironmentThemesControllerTest < ActionController::TestCase
   should 'highlight current template' do
     env = Environment.default
     env.update_attributes!(:layout_template => 'default')
+    env.layout_template = 'default'
 
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
diff --git a/test/functional/profile_themes_controller_test.rb b/test/functional/profile_themes_controller_test.rb
index 9bca83d..745f2e6 100644
--- a/test/functional/profile_themes_controller_test.rb
+++ b/test/functional/profile_themes_controller_test.rb
@@ -254,7 +254,8 @@ class ProfileThemesControllerTest < ActionController::TestCase
   end
 
   should 'display links to set template' do
-    profile.update_attributes!(:layout_template => 'rightbar')
+    profile.layout_template = 'rightbar'
+    profile.save!
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
     LayoutTemplate.expects(:all).returns([t1, t2])
@@ -265,7 +266,8 @@ class ProfileThemesControllerTest < ActionController::TestCase
   end
 
   should 'highlight current template' do
-    profile.update_attributes!(:layout_template => 'default')
+    profile.layout_template = 'default'
+    profile.save!
 
     t1 = LayoutTemplate.find('default')
     t2 = LayoutTemplate.find('leftbar')
--
libgit2 0.21.2