Finishing up forgot pass functionality