moved account link to template
Stuff
Mergefix