fix login issue; fix deep linking issue