diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
index 3ff51a60e..ee1e92fb5 100644
--- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php
+++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
@@ -117,7 +117,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
         $save = new Zend_Form_Element_Button('save_button');
         $save->setAttrib('class', 'ui-button ui-state-default right-floated');
         $save->setIgnore(true);
-        $save->setLabel('Save');
+        $save->setLabel('Generate');
         $this->addElement($save);
     }
 }
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 329e0d856..1feebf194 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -47,8 +47,8 @@ function setSmartPlaylistEvents() {
     form.find('button[id="save_button"]').click(function(event){
         var playlist_type = form.find('input:radio[name=sp_type]:checked').val(),
             data = $('form').serializeArray(),
-            static_action = 'Playlist/smart-playlist-criteria-save',
-            dynamic_action ='Playlist/smart-playlist-criteria-generate',
+            static_action = 'Playlist/smart-playlist-criteria-generate',
+            dynamic_action ='Playlist/smart-playlist-criteria-save',
             action,
             callback;
 		
@@ -66,9 +66,9 @@ function setSmartPlaylistEvents() {
         var playlist_type = $('input:radio[name=sp_type]:checked').val(),
             button_text;
         if (playlist_type == "0") {
-            button_text = 'Save';
-        } else {
             button_text = 'Generate';
+        } else {
+            button_text = 'Save';
         }
         $('button[id="save_button"]').text(button_text);    	
     });