Fix Password pass through