[v3.4] #966 fix default user / admin permissions

resolves #966 on `release-v3.4`
In my mind, this indentation, while slightly less readable, makes more sense since the `when` conditionals align with `end`. I don't know how important this is; I agree we should be consistent, so the larger block should be changed as well (I can handle that assuming the functionality seems to be working).