FS-1 FS-2 Update login and register code