diff --git a/web/app/controllers/spikes_controller.rb b/web/app/controllers/spikes_controller.rb
index 40dbeda9e..1c3c39e6e 100644
--- a/web/app/controllers/spikes_controller.rb
+++ b/web/app/controllers/spikes_controller.rb
@@ -42,8 +42,4 @@ class SpikesController < ApplicationController
     render :layout => 'web'
   end
 
-  def username_validate
-    render :layout => 'web'
-  end
-
 end
diff --git a/web/app/views/spikes/site_validate.html.slim b/web/app/views/spikes/site_validate.html.slim
index cd0a475e7..ccd9d8749 100644
--- a/web/app/views/spikes/site_validate.html.slim
+++ b/web/app/views/spikes/site_validate.html.slim
@@ -1,14 +1,19 @@
 = javascript_include_tag "site_validator"
 div style="width:50%"
-  = render "clients/site_validator", site_type: 'url'
+  = render "clients/site_validator", site_type: params[:site_type] || 'url'
 = stylesheet_link_tag "client/site_validator"
+<br />
+= select_tag "site_type", options_for_select(Utils::SITE_TYPES, params[:site_type] || 'url')
 
 javascript:
   var initialized = false;
   $(document).on('JAMKAZAM_READY', function(e, data) {
       setTimeout(function() {
-        window.site_validator = new JK.SiteValidator('url')
-        site_validator.init()
-        $('#validate_input_url').val('http://www.jamkazam.com')
+        window.site_validator = new JK.SiteValidator('#{params[:site_type] || 'url'}');
+        site_validator.init();
+        $('#validate_input_'+'#{params[:site_type] || 'url'}').val('jonathankolyer');
       }, 1)
-  })
+  });
+  $('#site_type').change(function(){ 
+    location.href = 'site_validate?site_type='+$(this).val();
+  });
diff --git a/web/app/views/spikes/username_validate.html.slim b/web/app/views/spikes/username_validate.html.slim
deleted file mode 100644
index 2af35bb8a..000000000
--- a/web/app/views/spikes/username_validate.html.slim
+++ /dev/null
@@ -1,14 +0,0 @@
-= javascript_include_tag "site_validator"
-div style="width:50%"
-  = render "clients/site_validator", site_type: 'youtube'
-= stylesheet_link_tag "client/site_validator"
-
-javascript:
-  var initialized = false;
-  $(document).on('JAMKAZAM_READY', function(e, data) {
-      setTimeout(function() {
-        window.site_validator = new JK.SiteValidator('youtube')
-        site_validator.init()
-        $('#validate_input_youtube').val('jonathankolyer')
-      }, 1)
-  })
diff --git a/web/lib/utils.rb b/web/lib/utils.rb
index b4e570ee5..941294be4 100644
--- a/web/lib/utils.rb
+++ b/web/lib/utils.rb
@@ -1,14 +1,17 @@
 class Utils
 
+  USERNAME_SITES = %W{youtube facebook soundcloud bandcamp fandalism twitter reverbnation}
+  SITE_TYPES = ['url'].concat(USERNAME_SITES)
+
   def self.username_url(username, site)
     case site
     when 'youtube'
       "https://www.youtube.com/c/#{username}"
-    when 'facebook'
+    when 'facebook'  # 
       "https://www.facebook.com/#{username}"
-    when 'soundcloud'
+    when 'soundcloud'  # 
       "https://soundcloud.com/#{username}"
-    when 'bandcamp'
+    when 'bandcamp'  # 
       "http://#{username}.bandcamp.com"
     when 'fandalism'
       "http://fandalism.com/#{username}"
@@ -21,7 +24,7 @@ class Utils
     end
   end
 
-  def self.url_validator(url)
+  def self.site_validator(url)
     result = `curl --output /dev/null --silent --head --fail --show-error '#{url}' 2>&1`.chomp
     if $?.success?
       return nil
diff --git a/web/spec/javascripts/fixtures/url_validator_spec.html.slim b/web/spec/javascripts/fixtures/site_validator_spec.html.slim
similarity index 100%
rename from web/spec/javascripts/fixtures/url_validator_spec.html.slim
rename to web/spec/javascripts/fixtures/site_validator_spec.html.slim
diff --git a/web/spec/javascripts/url_validator_spec.js.coffee b/web/spec/javascripts/site_validator_spec.js.coffee
similarity index 100%
rename from web/spec/javascripts/url_validator_spec.js.coffee
rename to web/spec/javascripts/site_validator_spec.js.coffee
diff --git a/web/spec/javascripts/stylesheets/url_validator.css.scss b/web/spec/javascripts/stylesheets/site_validator.css.scss
similarity index 100%
rename from web/spec/javascripts/stylesheets/url_validator.css.scss
rename to web/spec/javascripts/stylesheets/site_validator.css.scss