diff --git a/src/mpd_handler.rs b/src/mpd_handler.rs
index b93226c..5064680 100644
--- a/src/mpd_handler.rs
+++ b/src/mpd_handler.rs
@@ -263,10 +263,10 @@ impl MPDHandler {
                 current_binary_size: 0,
                 poll_state: PollState::None,
                 stream,
-                password,
+                password: password.clone(),
                 error_text: String::new(),
                 can_authenticate: true,
-                is_authenticated: false,
+                is_authenticated: password.is_empty(),
                 can_get_album_art: true,
                 can_get_album_art_in_dir: true,
                 can_get_status: true,