diff --git a/Gemfile.lock b/Gemfile.lock
index 03a7d75c..ad0ac14b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,7 @@ PATH
     foodsoft_wiki (0.0.1)
       acts_as_versioned
       content_for_in_controllers
+      deface (~> 1.0)
       diffy
       rails
       wikicloth
diff --git a/app/views/admin/configs/_tab_others.html.haml b/app/views/admin/configs/_tab_others.html.haml
index 968b0306..96747794 100644
--- a/app/views/admin/configs/_tab_others.html.haml
+++ b/app/views/admin/configs/_tab_others.html.haml
@@ -1,5 +1,3 @@
-- if defined? FoodsoftWiki # avoid requiring deface here (the single exception)
-  = config_input form, :use_wiki, as: :boolean
 = config_input form, :use_nick, as: :boolean
 = config_input form, :tolerance_is_costly, as: :boolean
 = config_input form, :disable_invite, as: :boolean
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 6dbfeb6f..76760654 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -10,9 +10,6 @@
   .alert.alert-error
     != t '.nojs', link: link_to(t('.noscript'), "http://noscript.net/")
 
-- if defined?(FoodsoftWiki) && (page = Page.public_front_page)
-  = wikified_body page.body, page.title
-
 = form_tag sessions_path, class: 'form-horizontal' do
   .control-group
     %label(for='nick' class='control-label')
diff --git a/plugins/wiki/app/overrides/admin/configs/_tab_others/add_wiki_config.html.haml.deface b/plugins/wiki/app/overrides/admin/configs/_tab_others/add_wiki_config.html.haml.deface
new file mode 100644
index 00000000..b1e11b1f
--- /dev/null
+++ b/plugins/wiki/app/overrides/admin/configs/_tab_others/add_wiki_config.html.haml.deface
@@ -0,0 +1,2 @@
+/ insert_before ':root:first-child'
+= config_input form, :use_wiki, as: :boolean
diff --git a/plugins/wiki/app/overrides/sessions/new/public_frontpage.html.haml.deface b/plugins/wiki/app/overrides/sessions/new/public_frontpage.html.haml.deface
new file mode 100644
index 00000000..9c4f2071
--- /dev/null
+++ b/plugins/wiki/app/overrides/sessions/new/public_frontpage.html.haml.deface
@@ -0,0 +1,3 @@
+/ insert_after 'noscript'
+- if FoodsoftWiki.enabled? && (page = Page.public_front_page)
+  = wikified_body page.body, page.title
diff --git a/plugins/wiki/foodsoft_wiki.gemspec b/plugins/wiki/foodsoft_wiki.gemspec
index ceeca06c..a71b9800 100644
--- a/plugins/wiki/foodsoft_wiki.gemspec
+++ b/plugins/wiki/foodsoft_wiki.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails"
   s.add_dependency 'wikicloth'
   s.add_dependency 'acts_as_versioned' # need git version, make sure that is included in foodsoft's Gemfile
+  s.add_dependency "deface", "~> 1.0"
   s.add_dependency 'diffy'
   s.add_dependency 'content_for_in_controllers'
   s.add_development_dependency "sqlite3"