[ADD] Mousetrap and FIX authentication problem