diff --git a/airtime_mvc/application/forms/SoundcloudPreferences.php b/airtime_mvc/application/forms/SoundcloudPreferences.php
index 8fe460c15..e948ba4f4 100644
--- a/airtime_mvc/application/forms/SoundcloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundcloudPreferences.php
@@ -1,5 +1,6 @@
 <?php
 require_once 'customvalidators/ConditionalNotEmpty.php';
+require_once 'customvalidators/PasswordNotEmpty.php';
 
 class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 {
@@ -76,7 +77,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
             // which is something we don't want
             'allowEmpty' => false,
             'validators' => array(
-                new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1'))
+                new PasswordNotEmpty(array('UploadToSoundcloudOption'=>'1'))
             )
         ));
 
diff --git a/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php b/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php
new file mode 100644
index 000000000..11e62b933
--- /dev/null
+++ b/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php
@@ -0,0 +1,18 @@
+<?php
+
+class PasswordNotEmpty extends ConditionalNotEmpty {
+    public function isValid($value, $context = null)
+    {
+        $result = parent::isValid($value, $context);
+        if (!$result) {
+            // allow empty if username/email was set before and didn't change
+            $storedUser = Application_Model_Preference::GetSoundCloudUser();
+            if ($storedUser != '' && $storedUser == $context['SoundCloudUser']) {
+                return true;
+            }
+        }
+        return $result;
+    }
+}
+
+?>