Elkpr/383

This PR is a cleaned version of https://github.com/elkarte/Elkarte/pull/383. I open it for review.

(cleaned of extra-commits, I mean :smiley_cat:)