diff --git a/web/jump/views.py b/web/jump/views.py
index 6ea06f4..f160659 100644
--- a/web/jump/views.py
+++ b/web/jump/views.py
@@ -22,13 +22,23 @@ def jumper(request, host):
 		return render_to_response('jump-unknown.html', {
 			'title': settings.SITE_NAME,
 			})
-	url = 'http://' + hostname + '/?i2paddresshelper=' + key
+	# begin forming url
+	url = 'http://' + hostname
 	# get params from requst string, e.g. from 'example.i2p/smth/1?a=b&c=d' get 'smth/1?a=b&c=d'
 	pattern = host + r'/(.+)'
 	m = re.search(pattern, request.get_full_path())
 	if m:
 		params = m.group(1)
 		url += '/' + params
+		# determine how we should pass i2paddresshelper
+		# http://zzz.i2p/oldnews.html#jump
+		if params.find('?') == -1:
+			suffix = '?'
+		else:
+			suffix = '&'
+		url += suffix + 'i2paddresshelper=' + key
+	else:
+		url += '/?i2paddresshelper=' + key
 	return render_to_response('jump.html', {
 		'title': settings.SITE_NAME,
 		'url': url,