diff --git a/conf/default.pa b/conf/default.pa
index e3ad553f129a79a957fdc2df9f85ab72783bb661..701d098b80079a13f4856aa877e08c04cdfc8cde 100644
--- a/conf/default.pa
+++ b/conf/default.pa
@@ -32,5 +32,5 @@ load-module libmodule-native-protocol-unix.z.so auth-cookie=/data/data/.pulse_di
 load-module libmodule-suspend-on-idle.z.so timeout=3
 
 ### Make some devices default
-#set-default-sink output
+set-default-sink Speaker
 #set-default-source input
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 7c6cb78a3f303c93f3a3f7eb39a69393d974485b..90f76ee09dcb3ddafc2bb46abd008439e9efa7c3 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -1295,10 +1295,10 @@ bool pa_source_output_may_move(pa_source_output *o) {
     pa_assert_ctl_context();
     pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state));
 
-    if (o->flags & PA_SOURCE_OUTPUT_DONT_MOVE)
+    if (o->flags & PA_SOURCE_OUTPUT_DONT_MOVE) {
         pa_log_info("Refused move to new default source!");
         return false;
-
+    }
     if (o->direct_on_input)
         return false;