FS-1 FS-2 updated login order and fix typo