Auto save application settings - Bug fixing