diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index 25d4c59..d9a76a8 100644
Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index c21c729..bd3992a 100644
--- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -525,8 +525,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "611"
             endingLineNumber = "611"
-            landmarkName = "EtsyRESTAPIManager"
-            landmarkType = "3">
+            landmarkName = "sendGETRequest(_:onCompletion:)"
+            landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
diff --git a/Vendoo/EtsyRESTAPIManager.swift b/Vendoo/EtsyRESTAPIManager.swift
index e36346e..77dcb8c 100644
--- a/Vendoo/EtsyRESTAPIManager.swift
+++ b/Vendoo/EtsyRESTAPIManager.swift
@@ -105,7 +105,7 @@ class EtsyRESTAPIManager: NSObject {
 extension EtsyRESTAPIManager {
     
     //makes application ready for use with users etsy account
-    func authorizeApp(viewcontroller: UIViewController){
+    func authorizeApp(viewcontroller: UIViewController, onComplete: ServiceResponse!){
         var boolResult: Bool!
         
         
@@ -225,6 +225,8 @@ extension EtsyRESTAPIManager {
                                                                                 EtsyRESTAPIManager.settingsDictionary["userID"] = dict2[0]["login_name"]!
                                                                                 NSUserDefaults.standardUserDefaults().setObject(EtsyRESTAPIManager.settingsDictionary, forKey: "etsySettings")
                                                                                 
+                                                                                onComplete(nil,nil)
+                                                                                
                                                                                 self.sendGETRequest("/private/shops/__SELF__/payment_templates", onCompletion: {
                                                                                     (data, error) -> Void in
                                                                                     
diff --git a/Vendoo/FacebookGraphAPIManager.swift b/Vendoo/FacebookGraphAPIManager.swift
index 2948775..7cf1a8c 100644
--- a/Vendoo/FacebookGraphAPIManager.swift
+++ b/Vendoo/FacebookGraphAPIManager.swift
@@ -65,7 +65,7 @@ class FacebookGraphAPIManager: NSObject {
 //MARK: - OAuth Methods
 extension FacebookGraphAPIManager {
     
-    func authorizeApp(viewcontroller: UIViewController) -> Bool{
+    func authorizeApp(viewcontroller: UIViewController, onComplete: ServiceResponse!) -> Bool{
         
         login.loginBehavior = FBSDKLoginBehavior.Web
         if(!self.isAuthorized){
@@ -107,11 +107,13 @@ extension FacebookGraphAPIManager {
                                         NSUserDefaults.standardUserDefaults().setBool(true, forKey:"fbAuthorized")
                                         self.isAuthorized = true
 
-
+                                        onComplete(nil,nil)
                                     })
                                     
                                 })
                                 
+                            }else{
+                                onComplete(nil,nil)
                             }
                             
                         }
diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift
index 0b476e9..21e708e 100644
--- a/Vendoo/NetworksTableViewController.swift
+++ b/Vendoo/NetworksTableViewController.swift
@@ -800,21 +800,27 @@ extension NetworksTableViewController {
                 break
             case is EtsyTableViewCell.Type:
                 let tabBar = self.tabBarController
-                ((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self))!
-                dispatch_async(dispatch_get_main_queue(), {
-                    sender.setTitle("Logout", forState: UIControlState.Normal)
-                    (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = true
-                    (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = false
-                })
+                ((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self, onComplete: {
+                something , _ -> Void in
+                    dispatch_async(dispatch_get_main_queue(), {
+                        sender.setTitle("Logout", forState: UIControlState.Normal)
+                        (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = true
+                        (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = false
+                    })
+                }))!
+                
                 break
             case is FBTableViewCell.Type:
                 let tabBar = self.tabBarController
-                ((tabBar as? HomeViewController)?.fbGraphManager.authorizeApp(self))!
-                dispatch_async(dispatch_get_main_queue(), {
-                    sender.setTitle("Logout", forState: UIControlState.Normal)
-                    (sender.superview?.superview as! FBTableViewCell).settingsBtn.enabled = true
-                    (sender.superview?.superview as! FBTableViewCell).settingsBtn.hidden = false
-                })
+                ((tabBar as? HomeViewController)?.fbGraphManager.authorizeApp(self, onComplete: {
+                something , _ -> Void in
+                    dispatch_async(dispatch_get_main_queue(), {
+                        sender.setTitle("Logout", forState: UIControlState.Normal)
+                        (sender.superview?.superview as! FBTableViewCell).settingsBtn.enabled = true
+                        (sender.superview?.superview as! FBTableViewCell).settingsBtn.hidden = false
+                    })
+                }))!
+                
 
                 break
             default: