password check
fixed truncate error
merged password check and truncate error fix from refactor