Merge "Fix account problems"