Adde User Crypt Password and other minor changes