Fixed bug when current currency was not saved