Fixes with invalid password spec and standarize the indention across the spec file