diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 6beeb90f6..ac10c0ca3 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -1,4 +1,4 @@
-#!@PULSEAUDIO_BINARY@ -nF 
+#!@PA_BINARY@ -nF 
 
 #
 # This file is part of PulseAudio.
diff --git a/src/pulse/context.c b/src/pulse/context.c
index a25e2f78e..f6452d4ed 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -430,7 +430,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
     ucred.pid = getpid();
     ucred.uid = getuid();
                    
-    if ((ucred.gid = pa_get_gid_of_group(PA_ACCESS_GROUP)) == (gid_t) -1)
+    if ((ucred.gid = pa_get_gid_of_group(c->conf->access_group)) == (gid_t) -1)
         ucred.gid = getgid();
     
     pa_pstream_send_tagstruct_with_creds(c->pstream, t, &ucred);