Terminal Shell Path gets Reset to Default on Every Load

I am using WebStorm Build #WS-163.7743.25 on Windows 7, and any time that I start WebStorm, my Terminal Settings for Shell Path gets set to cmd.exe. I have changed both, Settings and Default Settings, and they are both set to cmd.exe anytime that I start WebStorm.

I am setting the Shell Path to: "C:\Program Files\Git\bin\sh.exe" -login -i. After I change the Shell Path, it will use Git until I restart WebStrom