Improve the way the index password was being accessed