Middleware no longer needed

Bug is fixed.
Fix multiple account association bug

This is a temporary fix. Needs more robust solution. Multiple account association?