Resolved accounts module issues V1.7.2