added formgroup and proper display logic block to changeEmail and changePassword handlebars templates