Ensure user dependent elements visibility

Didn't spot any side-effects from doing this. Will have to watch out though.