Bug fixing

Corrected gramatical error in strings.  Fixed bug where data protection
flag was not reset even when last account removed.  A couple of minor
coding improvements.