fix remember orignal user issues