diff --git a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
index b12f29525..8b7e8a75c 100644
--- a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
+++ b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
@@ -19,6 +19,9 @@
 				<h2 translate>WPS-PBC: Push Button on Device</h2>
 				<p translate>wifi.wps.pbc.info</p>
 				<luci-config-lines>
+					<luci-config-line  ng-show="boardpanel"  title="{{'Enable WPS button on router'|translate}}">
+						<switch id="enabled" name="enabled" ng-model="boardpanel.settings.wpsbutton.value" class="green" ng-change="save()" ></switch>
+					</luci-config-line>
 					<luci-config-line  ng-show="boardpanel"  title="{{'Pressing WiFi on/off button on your router for long time activates pairing '|translate}}">
 						<switch id="enabled" name="enabled" ng-model="boardpanel.settings.wifibutton.value" class="green" ng-change="save()" ></switch>
 					</luci-config-line>
diff --git a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.js b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.js
index 5285d46bc..ef791830f 100644
--- a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.js
+++ b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.js
@@ -22,49 +22,45 @@ $juci.module("wifi")
 	$rpc.wps.showpin().done(function(data){
 		$scope.generatedPIN = data.pin; 
 	}); 
-	function pair(){
-		$scope.showProgress = 1; 
-		$scope.pairState = 'progress';
-		$scope.timeRemaining = 60;  
-		$uci.save().done(function(){
-			var interval = setInterval(function(){
-				$scope.timeRemaining --; 
-				if($scope.timeRemaining == 0){
-					clearInterval(interval); 
-				}
-			}, 1000); 
-			$rpc.wps.pbc().done(function(){
-				clearInterval(interval); 
-				$scope.pairState = 'success'; 
-				$scope.$apply(); 
-				setTimeout(function(){
-					$scope.showProgress = 0; 
-					$scope.$apply(); 
-				}, 2000); 
-			}).fail(function(){
-				clearInterval(interval); 
-				$scope.pairState = 'fail'; 
-				$scope.$apply(); 
-				setTimeout(function(){
-					$scope.showProgress = 0; 
-					$scope.$apply(); 
-				}, 2000); 
-			}).always(function(){
-				$scope.showProgress = 0; 
-			}); 
-		}); 
+	function wpsSuccess(){
+		$scope.pairState = 'success'; 
+		$scope.$apply(); 
+		setTimeout(function(){
+			$scope.showProgress = 0; 
+			$scope.$apply(); 
+		}, 2000); 
+	}
+	function wpsFail(){
+		$scope.pairState = 'fail'; 
+		$scope.$apply(); 
+		setTimeout(function(){
+			$scope.showProgress = 0; 
+			$scope.$apply(); 
+		}, 2000); 
 	}
 	$scope.save = function(){
 		$uci.save(); 
 	}
 	$scope.onPairPBC = function(){
-		
-		pair(); 
+		$scope.showProgress = 1; 
+		$scope.pairState = 'progress';
+		$rpc.wps.pbc().done(function(){
+			wpsSuccess(); 
+		}).fail(function(){
+			wpsFail(); 
+		}); 
 	}
 	$scope.onPairUserPIN = function(){
+		$scope.showProgress = 1; 
+		$scope.pairState = 'progress';
 		$rpc.wps.stapin({ pin: $scope.data.userPIN }).done(function(data){
-			pair(); 
-		}); 
+			wpsSuccess(); 
+		}).fail(function(){
+			wpsFail(); 
+		}).always(function(){
+			$scope.data.userPIN = ""; 
+			$scope.$apply(); 
+		});  
 	}
 	$scope.onGeneratePIN = function(){
 		$rpc.wps.genpin().done(function(data){