diff --git a/core/src/authentication.rs b/core/src/authentication.rs
index a536b558..8122d659 100644
--- a/core/src/authentication.rs
+++ b/core/src/authentication.rs
@@ -27,7 +27,7 @@ impl From<AuthenticationError> for Error {
 }
 
 /// The credentials are used to log into the Spotify API.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
 pub struct Credentials {
     pub username: String,
 
diff --git a/core/src/session.rs b/core/src/session.rs
index 5f08b134..69125e17 100755
--- a/core/src/session.rs
+++ b/core/src/session.rs
@@ -176,7 +176,13 @@ impl Session {
         self.set_username(&reusable_credentials.username);
         if let Some(cache) = self.cache() {
             if store_credentials {
-                cache.save_credentials(&reusable_credentials);
+                let cred_changed = cache
+                    .credentials()
+                    .map(|c| c != reusable_credentials)
+                    .unwrap_or(true);
+                if cred_changed {
+                    cache.save_credentials(&reusable_credentials);
+                }
             }
         }
 
diff --git a/playback/src/audio_backend/jackaudio.rs b/playback/src/audio_backend/jackaudio.rs
index 9d40ee82..5c7a28fb 100644
--- a/playback/src/audio_backend/jackaudio.rs
+++ b/playback/src/audio_backend/jackaudio.rs
@@ -47,8 +47,8 @@ impl Open for JackSink {
         let client_name = client_name.unwrap_or_else(|| "librespot".to_string());
         let (client, _status) =
             Client::new(&client_name[..], ClientOptions::NO_START_SERVER).unwrap();
-        let ch_r = client.register_port("out_0", AudioOut::default()).unwrap();
-        let ch_l = client.register_port("out_1", AudioOut::default()).unwrap();
+        let ch_r = client.register_port("out_0", AudioOut).unwrap();
+        let ch_l = client.register_port("out_1", AudioOut).unwrap();
         // buffer for samples from librespot (~10ms)
         let (tx, rx) = sync_channel::<f32>(NUM_CHANNELS as usize * 1024 * AudioFormat::F32.size());
         let jack_data = JackData {