account: re-defined debugs, fixed conditions