Fixes remember me upgrade and functionality

Replaces #6630.