Entering wrong Id resets Id. Bugfix: Id working now. Minor code changes.

Signed-off-by: Kyroy <info@kyroy.com>