Add option to not give master to normal users by default