diff --git a/app.rb b/app.rb
index 653b1fc7..977f4d4d 100644
--- a/app.rb
+++ b/app.rb
@@ -207,6 +207,11 @@ post '/change_name' do
   require_login
   old_username = current_site.username
 
+  if params[:name] == nil || params[:name] == ''
+    flash[:error] = 'Name cannot be blank.'
+    redirect '/settings'
+  end
+
   if old_username == params[:name]
     flash[:error] = 'You already have this name.'
     redirect '/settings'