diff --git a/web/app/assets/javascripts/band_setup.js b/web/app/assets/javascripts/band_setup.js
index ed03c4af2..9b2e0fe67 100644
--- a/web/app/assets/javascripts/band_setup.js
+++ b/web/app/assets/javascripts/band_setup.js
@@ -252,7 +252,7 @@
                 $("#band-website").val(band.website);
                 $("#band-biography").val(band.biography);
 
-                loadGenres();
+                loadGenres(band.genres);
 
                 loadCountries(band.country, function() {
                     loadRegions(band.state, function () {
@@ -287,13 +287,27 @@
             $(".autocomplete").width("150px");
         }
 
-        function loadGenres() {
-            rest.getGenres().done(function(response) {
-                $.each(response, function(index, val) {
+        function loadGenres(selectedGenres) {
+            $("band-genres").empty();
+
+            rest.getGenres().done(function(genres) {
+                $.each(genres, function(index, genre) {
                     var genreTemplate = $('#template-band-setup-genres').html();
+                    var selected = '';
+
+                    if (selectedGenres) {
+                        var genreMatch = $.grep(selectedGenres, function(n,i) {
+                            return n.id === genre.id;
+                        });
+
+                        if (genreMatch.length > 0) {
+                            selected = "checked";
+                        }
+                    }
                     var genreHtml = context.JK.fillTemplate(genreTemplate, {
-                        id: val.id,
-                        description: val.description
+                        id: genre.id,
+                        description: genre.description,
+                        checked: selected
                     });
 
                     $('#band-genres').append(genreHtml);
diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index 0504cfb2e..9265326b2 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -138,7 +138,7 @@
             });
         }
 
-        function getCities (options) {
+        function getCities(options) {
             var country = options['country']
             var region = options['region']
 
diff --git a/web/app/views/clients/_band_setup.html.erb b/web/app/views/clients/_band_setup.html.erb
index 2422189d1..fcacd7aac 100644
--- a/web/app/views/clients/_band_setup.html.erb
+++ b/web/app/views/clients/_band_setup.html.erb
@@ -132,7 +132,7 @@
 </div>
 
 <script type="text/template" id="template-band-setup-genres">
-    <tr><td><input value="{id}" type="checkbox" />{description}</td></tr>
+    <tr><td><input value="{id}" {checked} type="checkbox" />{description}</td></tr>
 </script>
 
 <script type="text/template" id="template-band-invitation">