fix remember me function
Merge branch 'remember_me_ifx' into dev