Add mandrill and fix bugs
Fix registering bug