Account and newDevice controller update

Added check for device id into the right file unlike my stupid self did
before.