Version of Milestone 2 - Freezing Account Dialog and Minor Fixes