Use "session" scope instead of creating new one

Fix the late night copy/paste mess too...