Added "already registered" functionality