Device Registration incorrect email handling.

Added incorrect email handling during device registration.