diff --git a/app/settings.rb b/app/settings.rb
index e8599730..4f2b3761 100644
--- a/app/settings.rb
+++ b/app/settings.rb
@@ -51,7 +51,8 @@ post '/settings/:username/profile' do
   require_ownership_for_settings
 
   @site.update(
-    profile_comments_enabled: params[:site][:profile_comments_enabled]
+    profile_comments_enabled: params[:site][:profile_comments_enabled],
+    profile_enabled: params[:site][:profile_enabled]
   )
   flash[:success] = 'Profile settings changed.'
   redirect "/settings/#{@site.username}#profile"
diff --git a/app/site.rb b/app/site.rb
index 244384d6..6bbbdbb8 100644
--- a/app/site.rb
+++ b/app/site.rb
@@ -11,6 +11,8 @@ get '/site/:username/?' do |username|
 
   redirect '/' if site.is_education
 
+  redirect site.uri unless site.profile_enabled
+
   @title = site.title
 
   @page = params[:page]
diff --git a/views/settings/site.erb b/views/settings/site.erb
index 5885bc71..bf34f3ae 100644
--- a/views/settings/site.erb
+++ b/views/settings/site.erb
@@ -26,7 +26,7 @@
           <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
           <!-- <li><a href="#domain" data-toggle="tab">Domain Name</a></li> -->
           <li><a href="#custom_domain" data-toggle="tab">Custom Domain</a></li>
-          <li><a href="#username" data-toggle="tab">Change Site (User) Name</a></li>
+          <li><a href="#username" data-toggle="tab">Change Site Name</a></li>
           <li><a href="#tipping" data-toggle="tab">Tipping</a></li>
 
           <li><a href="#api_key" data-toggle="tab">API Key</a></li>
diff --git a/views/settings/site/profile.erb b/views/settings/site/profile.erb
index 57958aae..4fdbd903 100644
--- a/views/settings/site/profile.erb
+++ b/views/settings/site/profile.erb
@@ -6,9 +6,15 @@
       <input name="site[profile_comments_enabled]" type="hidden" value="true">
       <input name="site[profile_comments_enabled]" type="checkbox" value="false"
         <% if @site.profile_comments_enabled == false %>checked<% end %>
-      > Turn off profile comments
+      > Disable Site Profile Comments
     </p>
 
+    <p>
+      <input name="site[profile_enabled]" type="hidden" value="true">
+      <input name="site[profile_enabled]" type="checkbox" value="false"
+        <% if @site.profile_enabled == false %>checked<% end %>
+      > Disable Site Profile
+    </p>
     <input class="btn-Action" type="submit" value="Update Site Profile Settings">
   </form>
-</div>
\ No newline at end of file
+</div>