minor change to pfc confirmation and penalty index
fixed conflicts to merge with origin
account/your-details first delete your account and change email address