Fix storage on exec, add infinite option to login