diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 91052a7..ac4a8b8 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -258,7 +258,7 @@ cat >$SERVERCONFFILE<<EOF
 	store dos attributes = yes
 	create mask = 755
 	store create time = yes
-	vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
+	vfs objects = $BINDIR/acl_xattr.so $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
 
 	#Include user defined custom parameters if set
 	$INCLUDE_CUSTOM_CONF
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 762af71..3b72506 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -607,6 +607,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c,
 
 int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 {
+	int conn_flags = NET_FLAGS_PDC;
+
+	if (!c->opt_user_specified) {
+		conn_flags |= NET_FLAGS_ANONYMOUS;
+	}
+
 	if (c->display_usage) {
 		d_printf(_("Usage:\n"
 			   "net rpc getsid\n"
@@ -615,7 +621,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 	}
 
 	return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id,
-			       NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+			       conn_flags,
 			       rpc_getsid_internals,
 			       argc, argv);
 }