Updated account and password templates