diff --git a/feeds/ucentral/uspot/files/usr/share/uspot/portal.uc b/feeds/ucentral/uspot/files/usr/share/uspot/portal.uc
index 98f6099b3..e1ebc575d 100644
--- a/feeds/ucentral/uspot/files/usr/share/uspot/portal.uc
+++ b/feeds/ucentral/uspot/files/usr/share/uspot/portal.uc
@@ -288,7 +288,15 @@ return {
 		}
 
 		if (!uam && connected?.state) {
-			include('connected.uc', ctx);
+			switch (split(ctx.env.REQUEST_URI, '?')[0] || '') {
+			case '/logout':
+			case '/logoff':
+				this.logoff(ctx, false);
+				break;
+			default:
+				include('connected.uc', ctx);
+				break;
+			}
 			return;
 		}
 		if (!connected.data.ssid) {