tuned up authorization logic for master activity