#918 Ranks can now be saved all at once
Improve if statement