Updated with "Remember Me" functionality