Stuff

fixes #2269

and add the new placements for cust_fields on PersonalMessages.template  seems the commit where I added those was never actually merged, must have been pushed on one of the lose branches I have :(

It seems theres a merge conflict, will go ahead and create the PR so github can tell me where the conflict is
oops, yeah, sorry about that, I'll add a fix soon.