Some improvements on protocol handling, added no password to security type