Cleanup + add password field syncing