diff --git a/app/views/admin_panel/_signup_welcome_screen.html.erb b/app/views/admin_panel/_signup_welcome_screen.html.erb
index d01aa8d..702ef43 100644
--- a/app/views/admin_panel/_signup_welcome_screen.html.erb
+++ b/app/views/admin_panel/_signup_welcome_screen.html.erb
@@ -8,4 +8,4 @@
   <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
 </div>
 <p>
-<%= render :file => 'home/welcome' %>
+<%= render :file => 'home/welcome', :locals => {:default_message => true} %>
diff --git a/app/views/home/welcome.html.erb b/app/views/home/welcome.html.erb
index 81557b6..cf7df19 100644
--- a/app/views/home/welcome.html.erb
+++ b/app/views/home/welcome.html.erb
@@ -1,6 +1,8 @@
+<% default_message = defined?(default_message) ? default_message : false %>
+
 <div id='thanks-for-signing'>
   <h1><%= _("Welcome to %s!") % environment.name %></h1>
-  <% if environment.has_custom_welcome_screen? %>
+  <% if environment.has_custom_welcome_screen? && !default_message %>
     <%= environment.settings[:signup_welcome_screen_body].html_safe %>
   <% else %>
       <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
--
libgit2 0.21.2