Merge Password Change stuff into dev