Implemented #2 and greatly improved password verification speed