Fixed group addresses and aliases

This should be inside a different check <3.5.4, right? So people that have already upgraded can benefit from it. or am I missing anything?