Closes #499 by checking the encrypted username for null.
Merge commit 'cfe6fb560f2f2da652272dc8ac7e8159d087d677' into HEAD