diff --git a/app/create.rb b/app/create.rb
index 87451727..05403947 100644
--- a/app/create.rb
+++ b/app/create.rb
@@ -76,13 +76,10 @@ post '/create' do
 
   session[:captcha_valid] = nil
 
-  EmailWorker.perform_async({
-    from: 'web@neocities.org',
-    reply_to: 'contact@neocities.org',
-    to: @site.email,
+  @site.send_email(
     subject: "[Neocities] Welcome to Neocities!",
     body: Tilt.new('./views/templates/email_welcome.erb', pretty: true).render(self)
-  })
+  )
 
   send_confirmation_email @site
 
diff --git a/models/site.rb b/models/site.rb
index 8731e4a1..135483b0 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1029,7 +1029,7 @@ class Site < Sequel::Model
   end
 
   def suggestions(limit=SUGGESTIONS_LIMIT, offset=0)
-    suggestions_dataset = Site.exclude(id: id).order(:views.desc, :updated_at.desc)
+    suggestions_dataset = Site.exclude(id: id).exclude(is_banned: true).exclude(is_nsfw: true).order(:views.desc, :updated_at.desc)
     suggestions = suggestions_dataset.where(tags: tags).limit(limit, offset).all
 
     return suggestions if suggestions.length == limit