diff --git a/AlfrescoActiviti.xcodeproj/project.pbxproj b/AlfrescoActiviti.xcodeproj/project.pbxproj
index b4fe23ef..c5d6d7e4 100644
--- a/AlfrescoActiviti.xcodeproj/project.pbxproj
+++ b/AlfrescoActiviti.xcodeproj/project.pbxproj
@@ -254,6 +254,7 @@
 		139E54041C218F1100CE4674 /* ASDKAppParserOperationWorker.m in Sources */ = {isa = PBXBuildFile; fileRef = 139E54021C218F1100CE4674 /* ASDKAppParserOperationWorker.m */; };
 		139E54081C21935500CE4674 /* ASDKModelApp.h in Headers */ = {isa = PBXBuildFile; fileRef = 139E54061C21935500CE4674 /* ASDKModelApp.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		139E54091C21935500CE4674 /* ASDKModelApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 139E54071C21935500CE4674 /* ASDKModelApp.m */; };
+		139F78F41E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 139F78F31E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.m */; };
 		139F78F81E548D020030EFCD /* AFAModalPeoplePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 139F78F71E548D020030EFCD /* AFAModalPeoplePickerViewController.m */; };
 		139FEC161B720FA600CE6B01 /* ASDKModelGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 139FEC141B720FA600CE6B01 /* ASDKModelGroup.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		139FEC171B720FA600CE6B01 /* ASDKModelGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 139FEC151B720FA600CE6B01 /* ASDKModelGroup.m */; };
@@ -372,7 +373,7 @@
 		13CE5C6E1B998711002E5172 /* ASDKModelFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CE5C6C1B998711002E5172 /* ASDKModelFilter.m */; };
 		13CE8ED11B85B27B0022F17A /* AFADrawerMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CE8ED01B85B27B0022F17A /* AFADrawerMenuViewController.m */; };
 		13CE8ED51B85B32E0022F17A /* AFAContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CE8ED41B85B32E0022F17A /* AFAContainerViewController.m */; };
-		13CF5C351B8CAD7200678C28 /* AFALoginModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CF5C341B8CAD7200678C28 /* AFALoginModel.m */; };
+		13CF5C351B8CAD7200678C28 /* AFALoginViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CF5C341B8CAD7200678C28 /* AFALoginViewModel.m */; };
 		13CF72001BCCDA3E0048C322 /* ASDKDiskServicesConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 13CF71FE1BCCDA3E0048C322 /* ASDKDiskServicesConstants.h */; };
 		13CF72011BCCDA3E0048C322 /* ASDKDiskServicesConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CF71FF1BCCDA3E0048C322 /* ASDKDiskServicesConstants.m */; };
 		13CFF33F1BBBBD5300D3DEB6 /* NSDate+AFADateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CFF33E1BBBBD5300D3DEB6 /* NSDate+AFADateAdditions.m */; };
@@ -956,6 +957,8 @@
 		139E54021C218F1100CE4674 /* ASDKAppParserOperationWorker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASDKAppParserOperationWorker.m; path = NetworkServices/ParserOperationManager/AppParserOperationWorker/ASDKAppParserOperationWorker.m; sourceTree = "<group>"; };
 		139E54061C21935500CE4674 /* ASDKModelApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASDKModelApp.h; path = Model/App/ASDKModelApp.h; sourceTree = "<group>"; };
 		139E54071C21935500CE4674 /* ASDKModelApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASDKModelApp.m; path = Model/App/ASDKModelApp.m; sourceTree = "<group>"; };
+		139F78F21E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFALoginCredentialsViewControllerDataSource.h; path = UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.h; sourceTree = "<group>"; };
+		139F78F31E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFALoginCredentialsViewControllerDataSource.m; path = UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.m; sourceTree = "<group>"; };
 		139F78F61E548D020030EFCD /* AFAModalPeoplePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFAModalPeoplePickerViewController.h; path = UI/ViewControllers/ModalPeoplePickerViewController/AFAModalPeoplePickerViewController.h; sourceTree = "<group>"; };
 		139F78F71E548D020030EFCD /* AFAModalPeoplePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFAModalPeoplePickerViewController.m; path = UI/ViewControllers/ModalPeoplePickerViewController/AFAModalPeoplePickerViewController.m; sourceTree = "<group>"; };
 		139FEC141B720FA600CE6B01 /* ASDKModelGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASDKModelGroup.h; path = Model/Group/ASDKModelGroup.h; sourceTree = "<group>"; };
@@ -1105,8 +1108,8 @@
 		13CE8ED01B85B27B0022F17A /* AFADrawerMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFADrawerMenuViewController.m; path = UI/ViewControllers/DrawerMenuScreen/AFADrawerMenuViewController.m; sourceTree = "<group>"; };
 		13CE8ED31B85B32E0022F17A /* AFAContainerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFAContainerViewController.h; path = UI/ViewControllers/ContainerController/AFAContainerViewController.h; sourceTree = "<group>"; };
 		13CE8ED41B85B32E0022F17A /* AFAContainerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFAContainerViewController.m; path = UI/ViewControllers/ContainerController/AFAContainerViewController.m; sourceTree = "<group>"; };
-		13CF5C331B8CAD7200678C28 /* AFALoginModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFALoginModel.h; path = Model/LoginModel/AFALoginModel.h; sourceTree = "<group>"; };
-		13CF5C341B8CAD7200678C28 /* AFALoginModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFALoginModel.m; path = Model/LoginModel/AFALoginModel.m; sourceTree = "<group>"; };
+		13CF5C331B8CAD7200678C28 /* AFALoginViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFALoginViewModel.h; path = Model/LoginModel/AFALoginViewModel.h; sourceTree = "<group>"; };
+		13CF5C341B8CAD7200678C28 /* AFALoginViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFALoginViewModel.m; path = Model/LoginModel/AFALoginViewModel.m; sourceTree = "<group>"; };
 		13CF71FE1BCCDA3E0048C322 /* ASDKDiskServicesConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASDKDiskServicesConstants.h; path = DiskServices/Constants/ASDKDiskServicesConstants.h; sourceTree = "<group>"; };
 		13CF71FF1BCCDA3E0048C322 /* ASDKDiskServicesConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASDKDiskServicesConstants.m; path = DiskServices/Constants/ASDKDiskServicesConstants.m; sourceTree = "<group>"; };
 		13CFF33D1BBBBD5300D3DEB6 /* NSDate+AFADateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDate+AFADateAdditions.h"; path = "Business/Categories/NSDate+AFADateAdditions.h"; sourceTree = "<group>"; };
@@ -2385,13 +2388,13 @@
 			name = Storyboards;
 			sourceTree = "<group>";
 		};
-		136E11321CE4AE1800047E38 /* AFAIntegrationServices */ = {
+		136E11321CE4AE1800047E38 /* IntegrationServices */ = {
 			isa = PBXGroup;
 			children = (
 				136E112F1CE4AE1400047E38 /* AFAIntegrationServices.h */,
 				136E11301CE4AE1400047E38 /* AFAIntegrationServices.m */,
 			);
-			name = AFAIntegrationServices;
+			name = IntegrationServices;
 			sourceTree = "<group>";
 		};
 		136E11371CE5BE0B00047E38 /* IntegrationLoginWebViewController */ = {
@@ -2758,6 +2761,7 @@
 		138D3D801C3FBAB400266A7C /* LoginCredentialsViewController */ = {
 			isa = PBXGroup;
 			children = (
+				139F78F51E4DEC420030EFCD /* DataSource */,
 				138D3D7D1C3FBAAE00266A7C /* AFALoginCredentialsViewController.h */,
 				138D3D7E1C3FBAAE00266A7C /* AFALoginCredentialsViewController.m */,
 			);
@@ -2989,7 +2993,7 @@
 				139DF5CB1C5F409B0062D01D /* FilterServices */,
 				139DF5CF1C5F4CE50062D01D /* FormServices */,
 				136680081C89AEFD005E4AEA /* QueryServices */,
-				136E11321CE4AE1800047E38 /* AFAIntegrationServices */,
+				136E11321CE4AE1800047E38 /* IntegrationServices */,
 			);
 			name = Services;
 			sourceTree = "<group>";
@@ -3066,6 +3070,15 @@
 			name = App;
 			sourceTree = "<group>";
 		};
+		139F78F51E4DEC420030EFCD /* DataSource */ = {
+			isa = PBXGroup;
+			children = (
+				139F78F21E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.h */,
+				139F78F31E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.m */,
+			);
+			name = DataSource;
+			sourceTree = "<group>";
+		};
 		139F78F91E548D060030EFCD /* ModalPeoplePickerController */ = {
 			isa = PBXGroup;
 			children = (
@@ -3755,13 +3768,13 @@
 			name = ContainerController;
 			sourceTree = "<group>";
 		};
-		13CF5C361B8CAD7500678C28 /* LoginModel */ = {
+		13CF5C361B8CAD7500678C28 /* LoginViewModel */ = {
 			isa = PBXGroup;
 			children = (
-				13CF5C331B8CAD7200678C28 /* AFALoginModel.h */,
-				13CF5C341B8CAD7200678C28 /* AFALoginModel.m */,
+				13CF5C331B8CAD7200678C28 /* AFALoginViewModel.h */,
+				13CF5C341B8CAD7200678C28 /* AFALoginViewModel.m */,
 			);
-			name = LoginModel;
+			name = LoginViewModel;
 			sourceTree = "<group>";
 		};
 		13CF72021BCCDA420048C322 /* Constants */ = {
@@ -4311,7 +4324,7 @@
 				8D7C1A6F1C8090B20092EA81 /* FilterModels */,
 				13A1B2821B989B2A00C4B6CE /* BaseModel */,
 				7597AEEE1B82426200F8B5DE /* CredentialModel */,
-				13CF5C361B8CAD7500678C28 /* LoginModel */,
+				13CF5C361B8CAD7500678C28 /* LoginViewModel */,
 				1323CFCC1B875FBC00E66D6F /* ImageContainerModel */,
 				13CFF3471BBC2B9500D3DEB6 /* TaskUpdateModel */,
 				13A5D6041CA046D300EFA760 /* TaskCreateModel */,
@@ -5477,6 +5490,7 @@
 				13C711EB1D0996F700E8550D /* AFACredentialSectionTableViewCell.m in Sources */,
 				13AAD3C71CDB82F600818537 /* AFAProfileActionTableViewCell.m in Sources */,
 				13BDA7431B7B733400A2CE40 /* AFALocalizationConstants.m in Sources */,
+				139F78F41E4DEC3D0030EFCD /* AFALoginCredentialsViewControllerDataSource.m in Sources */,
 				13FCF6411E5DCFE9002CC3EE /* AFARequeueTableViewCell.m in Sources */,
 				13A8CAB81B8B3FB100B7A25E /* AFAMenuButtonCell.m in Sources */,
 				13ACE37C1C9996B900693A29 /* AFAAddCommentsViewController.m in Sources */,
@@ -5562,7 +5576,7 @@
 				136D035B1C844F4700DC94B7 /* AFAProcessInstanceDetailsViewController.m in Sources */,
 				135443EC1B970D600044157B /* AFASliderButtonView.m in Sources */,
 				1328D34D1BB91CAC0010757C /* AFATableController.m in Sources */,
-				13CF5C351B8CAD7200678C28 /* AFALoginModel.m in Sources */,
+				13CF5C351B8CAD7200678C28 /* AFALoginViewModel.m in Sources */,
 				13C9B57A1B9451B10009BD27 /* AFAFilterViewController.m in Sources */,
 				7597AEED1B82425E00F8B5DE /* AFACredentialModel.m in Sources */,
 				13A8CABC1B8B49B400B7A25E /* AFAServiceRepository.m in Sources */,
diff --git a/AlfrescoActiviti/Base.lproj/Main.storyboard b/AlfrescoActiviti/Base.lproj/Main.storyboard
index edaca263..ad58b9f4 100644
--- a/AlfrescoActiviti/Base.lproj/Main.storyboard
+++ b/AlfrescoActiviti/Base.lproj/Main.storyboard
@@ -22,7 +22,7 @@
             <objects>
                 <navigationController storyboardIdentifier="Navigation" navigationBarHidden="YES" id="2sj-96-gBg" customClass="AFANavigationController" sceneMemberID="viewController">
                     <nil key="simulatedTopBarMetrics"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="v9Y-ro-k4e">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="v9Y-ro-k4e">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -38,7 +38,7 @@
         <scene sceneID="5ZC-YG-evy">
             <objects>
                 <navigationController id="Xjc-tR-raA" customClass="AFANavigationController" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" translucent="NO" id="IqS-JF-Kuz">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="IqS-JF-Kuz">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="barTintColor" red="0.19215686274509802" green="0.26666666666666666" blue="0.29411764705882354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -483,7 +483,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" alpha="0.59999999999999998" contentMode="left" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AiT-aw-wck">
-                                                    <rect key="frame" x="317" y="-1.5" width="50" height="60"/>
+                                                    <rect key="frame" x="317" y="-2" width="50" height="61"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="60" id="2al-i9-6Ls"/>
                                                         <constraint firstAttribute="width" constant="50" id="iwg-lb-gqI"/>
@@ -4038,8 +4038,6 @@
                                     </tableViewCell>
                                 </prototypes>
                                 <connections>
-                                    <outlet property="dataSource" destination="QG4-6w-H2D" id="n6b-pS-hPu"/>
-                                    <outlet property="delegate" destination="QG4-6w-H2D" id="YaZ-rZ-wXi"/>
                                     <outletCollection property="gestureRecognizers" destination="DtN-7W-JHp" appends="YES" id="upQ-1c-4Kv"/>
                                 </connections>
                             </tableView>
@@ -4094,7 +4092,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No internet connection available. Check your internet connection and try again." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3MP-b4-4aQ">
-                                <rect key="frame" x="38" y="353" width="300" height="38.5"/>
+                                <rect key="frame" x="38" y="353" width="300" height="39"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="gic-Yq-c6y"/>
                                 </constraints>
diff --git a/AlfrescoActiviti/Model/LoginModel/AFALoginModel.h b/AlfrescoActiviti/Model/LoginModel/AFALoginModel.h
deleted file mode 100644
index 2417aae5..00000000
--- a/AlfrescoActiviti/Model/LoginModel/AFALoginModel.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2005-2017 Alfresco Software Limited.
- *
- * This file is part of the Alfresco Activiti Mobile iOS App.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- ******************************************************************************/
-
-#import <Foundation/Foundation.h>
-#import "AFABaseModel.h"
-#import "AFAProfileServices.h"
-
-typedef void  (^AFALoginModelCompletionBlock) (BOOL isLoggedIn, NSError *error);
-
-typedef NS_ENUM(NSUInteger, AFALoginViewModelAuthentificationType) {
-    AFALoginViewModelAuthentificationTypeCloud,
-    AFALoginViewModelAuthentificationTypePremise
-};
-
-typedef NS_ENUM(NSUInteger, AFALoginViewModelAuthentificationState) {
-    AFALoginViewModelAuthentificationStatePreparing,
-    AFALoginViewModelAuthentificationStateInProgress,
-    AFALoginViewModelAuthentificationStateAuthorized,
-    AFALoginViewModelAuthentificationStateFailed,
-    AFALoginViewModelAuthentificationStateCanceled,
-    AFALoginViewModelAuthentificationStateLoggedOut
-};
-
-@interface AFALoginModel : AFABaseModel
-
-@property (strong, nonatomic) NSAttributedString *usernameAttributedPlaceholderText;
-@property (strong, nonatomic) NSAttributedString *passwordAttributedPlaceholderText;
-@property (strong, nonatomic) NSAttributedString *hostnameAttributedPlaceholderText;
-@property (strong, nonatomic) NSAttributedString *portAttributedPlaceholderText;
-@property (strong, nonatomic) NSAttributedString *serviceDocumentAttributedPlaceholderText;
-@property (assign, nonatomic) BOOL isCredentialInputInProgress;
-@property (assign, nonatomic) AFALoginViewModelAuthentificationState authState;
-@property (strong, nonatomic, readonly) NSString *hostName;
-@property (strong, nonatomic, readonly) NSString *username;
-@property (strong, nonatomic, readonly) NSString *password;
-@property (strong, nonatomic, readonly) NSString *port;
-@property (strong, nonatomic, readonly) NSString *serviceDocument;
-@property (assign, nonatomic, readonly) BOOL isSecureLayer;
-@property (assign, nonatomic, readonly) BOOL rememberCredentials;
-@property (assign, nonatomic) AFALoginViewModelAuthentificationType authentificationType;
-
-- (void)updateHostNameEntry:(NSString *)hostname;
-- (void)updateUserNameEntry:(NSString *)username;
-- (void)updatePasswordEntry:(NSString *)password;
-- (void)updatePortEntry:(NSString *)port;
-- (void)updateServiceDocument:(NSString *)serviceDocument;
-- (void)updateRememberCredentials:(BOOL)rememberCredentials;
-- (void)updateCommunicationOverSecureLayer:(BOOL)secureLayer;
-
-- (BOOL)canUserSignIn;
-- (void)requestLoginWithCompletionBlock:(AFALoginModelCompletionBlock)completionBlock;
-- (void)requestLogout;
-- (void)cancelLoginRequest;
-
-@end
diff --git a/AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.h b/AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.h
new file mode 100644
index 00000000..3ca7a107
--- /dev/null
+++ b/AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.h
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (C) 2005-2017 Alfresco Software Limited.
+ *
+ * This file is part of the Alfresco Activiti Mobile iOS App.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import "AFABaseModel.h"
+#import "AFAProfileServices.h"
+
+typedef void  (^AFALoginModelCompletionBlock) (BOOL isLoggedIn, NSError *error);
+
+typedef NS_ENUM(NSInteger, AFALoginAuthenticationType) {
+    AFALoginAuthenticationTypeCloud,
+    AFALoginAuthenticationTypePremise
+};
+
+typedef NS_ENUM(NSUInteger, AFALoginAuthenticationState) {
+    AFALoginAuthenticationStatePreparing,
+    AFALoginAuthenticationStateInProgress,
+    AFALoginAuthenticationStateAuthorized,
+    AFALoginAuthenticationStateFailed,
+    AFALoginAuthenticationStateCanceled,
+    AFALoginAuthenticationStateLoggedOut
+};
+
+@interface AFALoginViewModel : AFABaseModel
+
+@property (strong, nonatomic) NSAttributedString            *usernameAttributedPlaceholderText;
+@property (strong, nonatomic) NSAttributedString            *passwordAttributedPlaceholderText;
+@property (strong, nonatomic) NSAttributedString            *hostnameAttributedPlaceholderText;
+@property (strong, nonatomic) NSAttributedString            *portAttributedPlaceholderText;
+@property (strong, nonatomic) NSAttributedString            *serviceDocumentAttributedPlaceholderText;
+@property (assign, nonatomic) BOOL                          isCredentialInputInProgress;
+@property (strong, nonatomic, readonly) NSString            *hostName;
+@property (strong, nonatomic, readonly) NSString            *username;
+@property (strong, nonatomic, readonly) NSString            *password;
+@property (strong, nonatomic, readonly) NSString            *port;
+@property (strong, nonatomic, readonly) NSString            *serviceDocument;
+@property (assign, nonatomic, readonly) BOOL                isSecureLayer;
+@property (assign, nonatomic, readonly) BOOL                rememberCredentials;
+@property (assign, nonatomic) AFALoginAuthenticationState   authState;
+@property (assign, nonatomic) AFALoginAuthenticationType    authentificationType;
+
+- (void)updateHostNameEntry:(NSString *)hostname;
+- (void)updateUserNameEntry:(NSString *)username;
+- (void)updatePasswordEntry:(NSString *)password;
+- (void)updatePortEntry:(NSString *)port;
+- (void)updateServiceDocument:(NSString *)serviceDocument;
+- (void)updateRememberCredentials:(BOOL)rememberCredentials;
+- (void)updateCommunicationOverSecureLayer:(BOOL)secureLayer;
+
+- (BOOL)canUserSignIn;
+- (void)requestLoginWithCompletionBlock:(AFALoginModelCompletionBlock)completionBlock;
+- (void)requestLogout;
+- (void)cancelLoginRequest;
+
+@end
diff --git a/AlfrescoActiviti/Model/LoginModel/AFALoginModel.m b/AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.m
similarity index 81%
rename from AlfrescoActiviti/Model/LoginModel/AFALoginModel.m
rename to AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.m
index 1e1a83f9..eae7bfdd 100644
--- a/AlfrescoActiviti/Model/LoginModel/AFALoginModel.m
+++ b/AlfrescoActiviti/Model/LoginModel/AFALoginViewModel.m
@@ -16,7 +16,7 @@
  *  limitations under the License.
  ******************************************************************************/
 
-#import "AFALoginModel.h"
+#import "AFALoginViewModel.h"
 
 // Constants
 #import "AFALocalizationConstants.h"
@@ -34,13 +34,13 @@
 
 @import ActivitiSDK;
 
-@interface AFALoginModel ()
+@interface AFALoginViewModel ()
 
 @property (strong, nonatomic) AFACredentialModel *credentialModel;
 
 @end
 
-@implementation AFALoginModel
+@implementation AFALoginViewModel
 
 
 #pragma mark -
@@ -52,18 +52,18 @@ - (instancetype)init {
     if (self) {
         NSDictionary *placeholderAttributes = @{NSForegroundColorAttributeName : [UIColor placeholderColorForCredentialTextField]};
         
-        self.usernameAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginUsernamePlaceholderText, @"Username placeholder text")
+        _usernameAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginUsernamePlaceholderText, @"Username placeholder text")
                                                                                  attributes:placeholderAttributes];
-        self.passwordAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginPasswordPlaceholderText, @"Password placeholder text")
+        _passwordAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginPasswordPlaceholderText, @"Password placeholder text")
                                                                                  attributes:placeholderAttributes];
-        self.hostnameAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginHostnamePlaceholderText, @"Hostname placeholder text")
+        _hostnameAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginHostnamePlaceholderText, @"Hostname placeholder text")
                                                                                  attributes:placeholderAttributes];
-        self.portAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginPortPlaceholderText, @"Port placeholder text")
+        _portAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginPortPlaceholderText, @"Port placeholder text")
                                                                              attributes:placeholderAttributes];
-        self.serviceDocumentAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginServiceDocumentPlaceholderText, @"Document placeholder text")
+        _serviceDocumentAttributedPlaceholderText = [[NSAttributedString alloc] initWithString:NSLocalizedString(kLocalizationLoginServiceDocumentPlaceholderText, @"Document placeholder text")
                                                                                         attributes:placeholderAttributes];
-        self.credentialModel = [AFACredentialModel new];
-        self.credentialModel.serviceDocument = kASDKAPIApplicationPath;
+        _credentialModel = [AFACredentialModel new];
+        _credentialModel.serviceDocument = kASDKAPIApplicationPath;
     }
     
     return self;
@@ -142,8 +142,8 @@ - (BOOL)canUserSignIn {
 
 - (void)requestLoginWithCompletionBlock:(AFALoginModelCompletionBlock)completionBlock {
     // Authorization in progress
-    self.authState = AFALoginViewModelAuthentificationStateInProgress;
-
+    self.authState = AFALoginAuthenticationStateInProgress;
+    
     // Create the server configuration for the SDK bootstrap
     ASDKModelServerConfiguration *serverConfiguration = [ASDKModelServerConfiguration new];
     serverConfiguration.hostAddressString = self.credentialModel.hostname;
@@ -172,21 +172,21 @@ - (void)requestLoginWithCompletionBlock:(AFALoginModelCompletionBlock)completion
         __strong typeof(self) strongSelf = weakSelf;
         
         // Check first if the request wasn't previously canceled
-        if (AFALoginViewModelAuthentificationStateCanceled != strongSelf.authState &&
-            AFALoginViewModelAuthentificationStatePreparing != strongSelf.authState) {
+        if (AFALoginAuthenticationStateCanceled != strongSelf.authState &&
+            AFALoginAuthenticationStatePreparing != strongSelf.authState) {
             if (!error && profile) {
                 // Login is successfull - Check whether the user has choosen to remember credentials
                 // and store them in the keychain
                 if (strongSelf.credentialModel.rememberCredentials) {
                     
                     // Store in the user defaults which type of login is to be performed in the future
-                    NSString *currentAuthentificationIdentifier = (strongSelf.authentificationType == AFALoginViewModelAuthentificationTypeCloud) ? kCloudAuthetificationCredentialIdentifier : kPremiseAuthentificationCredentialIdentifier;
+                    NSString *currentAuthentificationIdentifier = (strongSelf.authentificationType == AFALoginAuthenticationTypeCloud) ? kCloudAuthetificationCredentialIdentifier : kPremiseAuthentificationCredentialIdentifier;
                     
                     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
                     [userDefaults setObject:currentAuthentificationIdentifier
                                      forKey:kAuthentificationTypeCredentialIdentifier];
                     
-                    if (AFALoginViewModelAuthentificationTypeCloud == strongSelf.authentificationType) {
+                    if (AFALoginAuthenticationTypeCloud == strongSelf.authentificationType) {
                         [userDefaults setObject:serverConfiguration.hostAddressString
                                          forKey:kCloudHostNameCredentialIdentifier];
                         [userDefaults setBool:serverConfiguration.isCommunicationOverSecureLayer
@@ -220,11 +220,11 @@ - (void)requestLoginWithCompletionBlock:(AFALoginModelCompletionBlock)completion
                     }
                 }
                 
-                strongSelf.authState = AFALoginViewModelAuthentificationStateAuthorized;
+                strongSelf.authState = AFALoginAuthenticationStateAuthorized;
                 completionBlock(YES, nil);
             } else {
                 // An error occured
-                strongSelf.authState = AFALoginViewModelAuthentificationStateFailed;
+                strongSelf.authState = AFALoginAuthenticationStateFailed;
                 
                 [AFAKeychainWrapper deleteItemFromKeychainWithIdentifier:kUsernameCredentialIdentifier];
                 [AFAKeychainWrapper deleteItemFromKeychainWithIdentifier:kPasswordCredentialIdentifier];
@@ -240,18 +240,18 @@ - (void)requestLogout {
     [AFAKeychainWrapper deleteItemFromKeychainWithIdentifier:kUsernameCredentialIdentifier];
     [AFAKeychainWrapper deleteItemFromKeychainWithIdentifier:kPasswordCredentialIdentifier];
     
-    self.authState = AFALoginViewModelAuthentificationStateLoggedOut;
+    self.authState = AFALoginAuthenticationStateLoggedOut;
 }
 
 - (void)cancelLoginRequest {
     // If user performed an action, meaning the authorization state changes
     // from preparing state then cancel the authorization
-    if (AFALoginViewModelAuthentificationStatePreparing != self.authState) {
-        self.authState = AFALoginViewModelAuthentificationStateCanceled;
+    if (AFALoginAuthenticationStatePreparing != self.authState) {
+        self.authState = AFALoginAuthenticationStateCanceled;
     }
     
     // Cancel also the request
-     AFAProfileServices *profileServices = [[AFAServiceRepository sharedRepository] serviceObjectForPurpose:AFAServiceObjectTypeProfileServices];
+    AFAProfileServices *profileServices = [[AFAServiceRepository sharedRepository] serviceObjectForPurpose:AFAServiceObjectTypeProfileServices];
     [profileServices cancellProfileNetworkRequests];
 }
 
diff --git a/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.h b/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.h
index 72638730..14fd0bfb 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.h
+++ b/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.h
@@ -18,7 +18,7 @@
 
 #import <UIKit/UIKit.h>
 
-@class AFALoginModel;
+@class AFALoginViewModel;
 @protocol AFAContainerViewControllerDelegate <NSObject>
 
 - (BOOL)isDrawerMenuOpen;
@@ -33,6 +33,6 @@
 
 @interface AFAContainerViewController : UIViewController
 
-@property (strong, nonatomic) AFALoginModel *loginModel;
+@property (strong, nonatomic) AFALoginViewModel *loginViewModel;
 
 @end
diff --git a/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.m b/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.m
index 033d35a4..1cf39e9c 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.m
+++ b/AlfrescoActiviti/UI/ViewControllers/ContainerController/AFAContainerViewController.m
@@ -43,7 +43,7 @@
 @import ActivitiSDK;
 
 // Models
-#import "AFALoginModel.h"
+#import "AFALoginViewModel.h"
 
 // Categories
 #import "UIViewController+AFAAlertAddition.h"
@@ -238,7 +238,7 @@ - (void)logoutUser {
 }
 
 - (void)requestUserLogout {
-    [self.loginModel requestLogout];
+    [self.loginViewModel requestLogout];
     dispatch_async(dispatch_get_main_queue(), ^{
         [self performSegueWithIdentifier:kSegueIDLoginAuthorizedUnwind
                                   sender:nil];
diff --git a/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.h b/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.h
index f45105c9..015a1419 100644
--- a/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.h
+++ b/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.h
@@ -17,12 +17,12 @@
  ******************************************************************************/
 
 #import <UIKit/UIKit.h>
-
-@class AFALoginModel;
+@class AFALoginViewModel;
 
 @interface AFACredentialsPageViewController : UIPageViewController <UIPageViewControllerDataSource>
 
-@property (strong, nonatomic) AFALoginModel *loginModel;
+@property (strong, nonatomic, readonly) AFALoginViewModel *cloudLoginViewModel;
+@property (strong, nonatomic, readonly) AFALoginViewModel *premiseLoginViewModel;
 
 - (void)showCloudLoginCredentials;
 - (void)showPremiseLoginCredentials;
diff --git a/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.m b/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.m
index ec1cfdb0..20bbe6b5 100644
--- a/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.m
+++ b/AlfrescoActiviti/UI/ViewControllers/CredentialsPageController/AFACredentialsPageViewController.m
@@ -19,6 +19,8 @@
 #import "AFACredentialsPageViewController.h"
 #import "AFALoginCredentialsViewController.h"
 #import "AFAUIConstants.h"
+#import "AFALoginCredentialsViewControllerDataSource.h"
+#import "AFALoginViewModel.h"
 
 typedef NS_ENUM(NSInteger, AFACredentialsPageType) {
     AFACredentialsPageTypeEmptyPlaceholder = 0,
@@ -34,16 +36,35 @@ @interface AFACredentialsPageViewController ()
 
 @implementation AFACredentialsPageViewController
 
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    self = [super initWithCoder:coder];
+    
+    if (self) {
+        _cloudLoginViewModel = [AFALoginViewModel new];
+        _cloudLoginViewModel.authentificationType = AFALoginAuthenticationTypeCloud;
+        _premiseLoginViewModel = [AFALoginViewModel new];
+        _premiseLoginViewModel.authentificationType = AFALoginAuthenticationTypePremise;
+    }
+    
+    return self;
+}
+
+
+#pragma mark - 
+#pragma View lifecycle
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    // Cloud setup
+    AFALoginCredentialsViewControllerDataSource *cloudDataSource = [[AFALoginCredentialsViewControllerDataSource alloc] initWithLoginModel:self.cloudLoginViewModel];
     AFALoginCredentialsViewController *loginCloudCredentialsViewController = [self.storyboard instantiateViewControllerWithIdentifier:kStoryboardIDLoginCredentialsViewController];
-    loginCloudCredentialsViewController.loginModel = self.loginModel;
-    loginCloudCredentialsViewController.loginType = AFALoginCredentialsTypeCloud;
+    loginCloudCredentialsViewController.dataSource = cloudDataSource;
     
+    // Premise setup
+    AFALoginCredentialsViewControllerDataSource *premiseDataSource = [[AFALoginCredentialsViewControllerDataSource alloc] initWithLoginModel:self.premiseLoginViewModel];
     AFALoginCredentialsViewController *loginPremiseCredentialsViewController = [self.storyboard instantiateViewControllerWithIdentifier:kStoryboardIDLoginCredentialsViewController];
-    loginPremiseCredentialsViewController.loginModel = self.loginModel;
-    loginPremiseCredentialsViewController.loginType = AFALoginCredentialsTypePremise;
+    loginPremiseCredentialsViewController.dataSource = premiseDataSource;
     
     UIViewController *emptyPlaceholderViewController = [UIViewController new];
     
@@ -54,16 +75,11 @@ - (void)viewDidLoad {
                   completion:nil];
 }
 
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 
 #pragma mark -
 #pragma mark UIPageViewController DataSource
 
--(UIViewController *)pageViewController:(UIPageViewController *)pageViewController
+- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController
      viewControllerBeforeViewController:(UIViewController *)viewController {
     NSUInteger currentIndex = [self.viewControllersList indexOfObject:viewController];
     
@@ -72,7 +88,7 @@ -(UIViewController *)pageViewController:(UIPageViewController *)pageViewControll
     return [self.viewControllersList objectAtIndex:currentIndex];
 }
 
--(UIViewController *)pageViewController:(UIPageViewController *)pageViewController
+- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController
       viewControllerAfterViewController:(UIViewController *)viewController {
     NSUInteger currentIndex = [self.viewControllersList indexOfObject:viewController];
     
diff --git a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.h b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.h
index 4290b8f0..fa73b999 100644
--- a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.h
+++ b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.h
@@ -17,70 +17,10 @@
  ******************************************************************************/
 
 #import <UIKit/UIKit.h>
-
-@class AFALoginModel;
-
-// Enumerations
-typedef NS_ENUM(NSInteger, AFALoginCredentialsType) {
-    AFALoginCredentialsTypeCloud,
-    AFALoginCredentialsTypePremise
-};
-
-typedef NS_ENUM(NSInteger, AFACloudLoginSectionType) {
-    AFACloudLoginSectionTypeAccountDetails,
-    AFACloudLoginSectionTypeSignIn,
-    AFACloudLoginSectionTypeEnumCount
-};
-
-typedef NS_ENUM(NSInteger, AFAPremiseLoginSectionType) {
-    AFAPremiseLoginSectionTypeAccountDetails = 0,
-    AFAPremiseLoginSectionTypeAdvanced,
-    AFAPremiseLoginSectionTypeSignIn,
-    AFAPremiseLoginSectionTypeEnumCount
-};
-
-typedef NS_ENUM(NSInteger, AFACloudLoginCredentialsCellType) {
-    AFACloudLoginCredentialsCellTypeEmail = 0,
-    AFACloudLoginCredentialsCellTypePassword,
-    AFACloudLoginCredentialsCellTypeEnumCount
-};
-
-typedef NS_ENUM(NSInteger, AFAPremiseLoginCredentialsCellType) {
-    AFAPremiseLoginCredentialsCellTypeEmail = 0,
-    AFAPremiseLoginCredentialsCellTypePassword,
-    AFAPremiseLoginCredentialsCellTypeHostname,
-    AFAPremiseLoginCredentialsCellTypeEnumCount
-};
-
-typedef NS_ENUM(NSInteger, AFAPremiseLoginAdvancedCredentialsCellType) {
-    AFAPremiseLoginAdvancedCredentialsCellTypeSecurityLayer = 0,
-    AFAPremiseLoginAdvancedCredentialsCellTypePort,
-    AFAPremiseLoginAdvancedCredentialsCellTypeServiceDocument,
-    AFAPremiseLoginAdvancedCredentialsCellTypeEnumCount
-};
-
-typedef NS_ENUM(NSInteger, AFASignInSectionCellType) {
-    AFASignInSectionCellTypeRememberCredentials = 0,
-    AFASignInSectionCellTypeSignIn,
-    AFASignInSectionCellTypeEnumCount
-};
-
-typedef NS_OPTIONS(NSUInteger, AFALoginCredentialEditing) {
-    AFALoginCredentialEditingFirstField  = 1<<0,
-    AFALoginCredentialEditingSecondField = 1<<1,
-};
-
-typedef NS_ENUM(NSInteger, AFALoginCredentialsFocusFieldOrder) {
-    AFALoginCredentialsFocusFieldOrderUsername = 0,
-    AFALoginCredentialsFocusFieldOrderPassword,
-    AFALoginCredentialsFocusFieldOrderHostname,
-    AFALoginCredentialsFocusFieldOrderPort,
-    AFALoginCredentialsFocusFieldOrderServiceDocument
-};
+#import "AFALoginCredentialsViewControllerDataSource.h"
 
 @interface AFALoginCredentialsViewController : UIViewController
 
-@property (assign, nonatomic) AFALoginCredentialsType        loginType;
-@property (strong, nonatomic) AFALoginModel                  *loginModel;
+@property (strong, nonatomic) id<AFALoginCredentialsViewControllerDataSource> dataSource;
 
 @end
diff --git a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.m b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.m
index 0c568393..0a4ac46c 100644
--- a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.m
+++ b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginCredentialsViewController.m
@@ -26,27 +26,17 @@
 // Categories
 #import "UIViewController+AFAAlertAddition.h"
 
-// Models
-#import "AFALoginModel.h"
-
 // Components
 #import "AFAFadingTableView.h"
 
 // Cells
-#import "AFACredentialTextFieldTableViewCell.h"
-#import "AFASignInTableViewCell.h"
-#import "AFARememberCredentialsTableViewCell.h"
-#import "AFASecurityLayerTableViewCell.h"
 #import "AFACredentialSectionTableViewCell.h"
 
-@interface AFALoginCredentialsViewController () <AFACredentialTextFieldTableViewCellDelegate, AFASignInButtonDelegate>
-
-@property (weak, nonatomic)   IBOutlet                       AFAFadingTableView *credentialsTableView;
-@property (assign, nonatomic) AFALoginCredentialEditing      credentialEditing;
-@property (assign, nonatomic) NSUInteger                     fieldTagIdx;
+@interface AFALoginCredentialsViewController () <AFALoginCredentialsViewControllerDataSourceDelegate,
+                                                UITableViewDelegate>
 
-// KVO
-@property (strong, nonatomic) ASDKKVOManager                 *kvoManager;
+@property (weak, nonatomic)   IBOutlet AFAFadingTableView   *credentialsTableView;
+@property (assign, nonatomic) NSUInteger                    fieldTagIdx;
 
 @end
 
@@ -56,12 +46,6 @@ @implementation AFALoginCredentialsViewController
 #pragma mark -
 #pragma mark View lifecycle
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.kvoManager = [ASDKKVOManager managerWithObserver:self];
-}
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
@@ -73,6 +57,10 @@ - (void)viewWillAppear:(BOOL)animated {
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
+    _dataSource.delegate = self;
+    self.credentialsTableView.dataSource = self.dataSource;
+    self.credentialsTableView.delegate = self;
+    
     // Adjust the table content inset to avoid a positioning inconsistency
     // when presenting the controller in a page controller with an animation
     CGFloat edgeInset = self.credentialsTableView.frame.origin.y;
@@ -82,16 +70,6 @@ - (void)viewDidAppear:(BOOL)animated{
     
     // Unlock if previously unlocked as a result from poping the controller
     [self lockInterface:NO];
-    
-    // Reset the auth state
-    self.loginModel.authState = AFALoginViewModelAuthentificationStatePreparing;
-    self.loginModel.authentificationType =
-    (AFALoginCredentialsTypeCloud == self.loginType) ? AFALoginViewModelAuthentificationTypeCloud : AFALoginViewModelAuthentificationTypePremise;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
 }
 
 
@@ -109,125 +87,13 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 
 
 #pragma mark -
-#pragma mark AFACredentialTextFieldTableViewCell Delegate
-
-- (void)inputTextFieldWillBeginEditting:(UITextField *)inputTextField
-                                 inCell:(UITableViewCell *)cell{
-    // First field is already being edited
-    if (self.credentialEditing & AFALoginCredentialEditingFirstField) {
-        self.credentialEditing |= AFALoginCredentialEditingSecondField;
-    } else if (self.credentialEditing & AFALoginCredentialEditingSecondField) { // Second field is already being edited
-        self.credentialEditing |= AFALoginCredentialEditingFirstField;
-    } else {
-        self.credentialEditing |= AFALoginCredentialEditingFirstField;
-    }
-    
-    self.loginModel.isCredentialInputInProgress = YES;
-}
-
-- (void)inputTextFieldWillEndEditting:(UITextField *)inputTextField
-                               inCell:(UITableViewCell *)cell{
-    // Stop editing first field
-    if (self.credentialEditing & AFALoginCredentialEditingFirstField) {
-        self.credentialEditing &= ~AFALoginCredentialEditingFirstField;
-    } else if (self.credentialEditing & AFALoginCredentialEditingSecondField) { // Stop editing the second field
-        self.credentialEditing &= ~AFALoginCredentialEditingSecondField;
-    }
-    
-    // Check and update final state - no other fields being edited
-    if (!(self.credentialEditing & AFALoginCredentialEditingFirstField) &&
-        !(self.credentialEditing & AFALoginCredentialEditingSecondField)) {
-        self.loginModel.isCredentialInputInProgress = NO;
-    }
-}
-
-- (void)inputTextFieldShouldReturn:(UITextField *)inputTextField
-                            inCell:(UITableViewCell *)cell {
-    NSInteger nextTag = inputTextField.tag + 1;
-    [self jumpFromTextField:inputTextField
-     toNextTextFieldWithTag:nextTag];
-}
-
-
-#pragma mark -
-#pragma mark AFASignInButton Delegate
-
-- (void)onSignIn:(id)sender
-        fromCell:(UITableViewCell *)cell {
-    // Resign the first responder for all active keyboards
-    [self.view endEditing:YES];
-    
-    // If the login type is of cloud type then update the model with
-    // the default host name and security layer
-    if (AFALoginCredentialsTypeCloud == self.loginType) {
-        [self.loginModel updateHostNameEntry:kActivitiCloudHostName];
-        [self.loginModel updateCommunicationOverSecureLayer:YES];
-        [self.loginModel updatePortEntry:nil];
-    }
-    
-    // Do all mandatory fields have informations needed in order to login
-    if ([self.loginModel canUserSignIn]) {
-        [self lockInterface:YES];
-        
-        __weak typeof(self) weakSelf = self;
-        [self.loginModel requestLoginWithCompletionBlock:^(BOOL isLoggedIn, NSError *error) {
-            __strong typeof(self) strongSelf = weakSelf;
-            [strongSelf lockInterface:NO];
-            
-            // Notify the user about the error
-            NSInteger responseCode = 0;
-            if (error) {
-                NSError *underlayingError = error.userInfo[NSUnderlyingErrorKey];
-                if (underlayingError) {
-                    responseCode = [[underlayingError.userInfo objectForKey:AFNetworkingOperationFailingURLResponseErrorKey] statusCode];
-                    if (!responseCode) {
-                        responseCode = underlayingError.code;
-                    }
-                } else {
-                    NSHTTPURLResponse *urlResponse = error.userInfo[AFNetworkingOperationFailingURLResponseErrorKey];
-                    responseCode = urlResponse.statusCode;
-                }
-                
-                NSString *networkErrorMessage = nil;
-                
-                switch (responseCode) {
-                    case ASDKHTTPCode401Unauthorised:
-                    case ASDKHTTPCode403Forbidden: {
-                        networkErrorMessage = NSLocalizedString(kLocalizationLoginInvalidCredentialsText, @"Invalid credentials text");
-                    }
-                        break;
-                        
-                    case NSURLErrorCannotConnectToHost: {
-                        networkErrorMessage = NSLocalizedString(kLocalizationLoginUnreachableHostText, @"Unreachable host text");
-                    }
-                        break;
-                        
-                    case NSURLErrorTimedOut: {
-                        networkErrorMessage = NSLocalizedString(kLocalizationLoginTimedOutText, @"Login timed out text");
-                    }
-                        break;
-                        
-                    default:
-                        break;
-                }
-                
-                [self showGenericNetworkErrorAlertControllerWithMessage:networkErrorMessage];
-                [(AFASignInTableViewCell *)cell shakeSignInButton];
-            }
-        }];
-    } else {
-        // Notify the user that something is wrong
-        [(AFASignInTableViewCell *)cell shakeSignInButton];
-    }
-}
-
-
-#pragma mark -
-#pragma mark Utilities
+#pragma mark AFALoginCredentialsViewControllerDataSourceDelegate
 
 - (void)lockInterface:(BOOL)lockInterface {
+    if (lockInterface) {
+        [self.view endEditing:YES];
+    }
     self.view.userInteractionEnabled = !lockInterface;
-    self.loginModel.isCredentialInputInProgress = NO;
 }
 
 - (void)jumpFromTextField:(UITextField *)fromTextField
@@ -241,51 +107,18 @@ - (void)jumpFromTextField:(UITextField *)fromTextField
     }
 }
 
-
-#pragma mark -
-#pragma mark Tableview Delegate & Datasource
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    // For the cloud login we just have 2 sections, a simple username / password pair of fields
-    // and the sign in section
-    return (AFALoginCredentialsTypePremise == self.loginType) ? AFAPremiseLoginSectionTypeEnumCount : 2;
+- (void)handleNetworkErrorWithMessage:(NSString *)errorMessage {
+    [self showGenericNetworkErrorAlertControllerWithMessage:errorMessage];
 }
 
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    NSInteger rowCount = 0;
-    
-    switch (self.loginType) {
-        case AFALoginCredentialsTypeCloud: {
-            if (AFACloudLoginSectionTypeAccountDetails == section) {
-                rowCount = AFACloudLoginCredentialsCellTypeEnumCount;
-            } else {
-                rowCount = AFASignInSectionCellTypeEnumCount;
-            }
-        }
-            break;
-            
-        case AFALoginCredentialsTypePremise: {
-            if (AFAPremiseLoginSectionTypeAccountDetails == section) {
-                rowCount = AFAPremiseLoginCredentialsCellTypeEnumCount;
-            } else if (AFAPremiseLoginSectionTypeAdvanced == section) {
-                rowCount = AFAPremiseLoginAdvancedCredentialsCellTypeEnumCount;
-            } else {
-                rowCount = AFASignInSectionCellTypeEnumCount;
-            }
-        }
-            break;
-            
-        default:
-            break;
-    }
-    
-    return rowCount;
-}
+
+#pragma mark -
+#pragma mark UITableViewDelegate
 
 - (CGFloat)tableView:(UITableView *)tableView
 heightForHeaderInSection:(NSInteger)section {
     CGFloat sectionHeight = 0;
-    if (AFALoginCredentialsTypePremise == self.loginType) {
+    if (AFALoginAuthenticationTypePremise == self.dataSource.loginModel.authentificationType) {
         if (AFAPremiseLoginSectionTypeAdvanced == section) {
             sectionHeight = 60.0f;
         }
@@ -301,294 +134,4 @@ -(UIView *)tableView:(UITableView *)tableView
     return sectionHeaderViewCell;
 }
 
-- (UITableViewCell *)tableView:(UITableView *)tableView
-         cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = nil;
-    
-    // Check if we're presenting a premise or cloud screen
-    if (AFALoginCredentialsTypePremise == self.loginType) {
-        
-        // Handle the dequeuing of each section that make up the premise login
-        if (AFAPremiseLoginSectionTypeAccountDetails == indexPath.section) {
-            switch (indexPath.row) {
-                case AFAPremiseLoginCredentialsCellTypeHostname: {
-                    cell = [self dequeueHostNameCellForTableView:tableView
-                                                       indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFAPremiseLoginCredentialsCellTypeEmail: {
-                    cell = [self dequeueEmailCellForTableView:tableView
-                                                    indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFAPremiseLoginCredentialsCellTypePassword: {
-                    cell = [self dequeuePasswordCellForTableView:tableView
-                                                       indexPath:indexPath];
-                }
-                    break;
-                    
-                default:
-                    break;
-            }
-        } else if (AFAPremiseLoginSectionTypeAdvanced == indexPath.section) {
-            switch (indexPath.row) {
-                case AFAPremiseLoginAdvancedCredentialsCellTypeSecurityLayer: {
-                    cell = [self dequeueSecurityLayerCellForTableView:tableView
-                                                            indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFAPremiseLoginAdvancedCredentialsCellTypePort: {
-                    cell = [self dequeuePortCellForTableView:tableView
-                                                   indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFAPremiseLoginAdvancedCredentialsCellTypeServiceDocument: {
-                    cell = [self dequeueServiceDocumentCellForTableView:tableView
-                                                              indexPath:indexPath];
-                }
-                    break;
-                    
-                default:
-                    break;
-            }
-        } else {
-            switch (indexPath.row) {
-                case AFASignInSectionCellTypeRememberCredentials: {
-                    cell = [self dequeueRememberCredentialsCellForTableView:tableView
-                                                                  indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFASignInSectionCellTypeSignIn: {
-                    cell = [self dequeueSignInCellForTableView:tableView];
-                }
-                    break;
-                    
-                default:
-                    break;
-            }
-        }
-    } else {
-        // Handle the dequeuing of each section that make up the cloud login
-        if (AFACloudLoginSectionTypeAccountDetails == indexPath.section) {
-            switch (indexPath.row) {
-                case AFACloudLoginCredentialsCellTypeEmail: {
-                    cell = [self dequeueEmailCellForTableView:tableView
-                                                    indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFACloudLoginCredentialsCellTypePassword: {
-                    cell = [self dequeuePasswordCellForTableView:tableView
-                                                       indexPath:indexPath];
-                }
-                    break;
-                    
-                default:
-                    break;
-            }
-        } else {
-            switch (indexPath.row) {
-                case AFASignInSectionCellTypeRememberCredentials: {
-                    cell = [self dequeueRememberCredentialsCellForTableView:tableView
-                                                                  indexPath:indexPath];
-                }
-                    break;
-                    
-                case AFASignInSectionCellTypeSignIn: {
-                    cell = [self dequeueSignInCellForTableView:tableView];
-                }
-                    break;
-                    
-                default:
-                    break;
-            }
-        }
-    }
-    
-    cell.backgroundColor = [UIColor clearColor];
-    
-    return cell;
-}
-
-
-#pragma mark - 
-#pragma mark Cell builders
-
-- (void)registerStateHandlerForCredentialCell:(AFACredentialTextFieldTableViewCell *)credentialCell {
-    __weak typeof(self) weakSelf = self;
-    [self.kvoManager observeObject:credentialCell
-                        forKeyPath:NSStringFromSelector(@selector(inputText))
-                           options:NSKeyValueObservingOptionNew
-                             block:^(id observer, id object, NSDictionary *change) {
-                                 __strong typeof(self) strongSelf = weakSelf;
-                                 
-                                 switch (credentialCell.inputTextField.tag) {
-                                     case AFALoginCredentialsFocusFieldOrderUsername: {
-                                         [strongSelf.loginModel updateUserNameEntry:change[NSKeyValueChangeNewKey]];
-                                     }
-                                         break;
-                                         
-                                     case AFALoginCredentialsFocusFieldOrderPassword: {
-                                         [strongSelf.loginModel updatePasswordEntry:change[NSKeyValueChangeNewKey]];
-                                     }
-                                         break;
-                                         
-                                     case AFALoginCredentialsFocusFieldOrderHostname: {
-                                         [strongSelf.loginModel updateHostNameEntry:change[NSKeyValueChangeNewKey]];
-                                     }
-                                         break;
-                                         
-                                     case AFALoginCredentialsFocusFieldOrderPort: {
-                                         [strongSelf.loginModel updatePortEntry:change[NSKeyValueChangeNewKey]];
-                                     }
-                                         break;
-                                         
-                                     case AFALoginCredentialsFocusFieldOrderServiceDocument: {
-                                         [strongSelf.loginModel updateServiceDocument:change[NSKeyValueChangeNewKey]];
-                                     }
-                                         break;
-                                         
-                                     default:
-                                         break;
-                                 }
-                             }];
-}
-
-
-- (AFASecurityLayerTableViewCell *)dequeueSecurityLayerCellForTableView:(UITableView *)tableView
-                                                              indexPath:(NSIndexPath *)indexPath {
-    AFASecurityLayerTableViewCell *securityLayerCell = [tableView dequeueReusableCellWithIdentifier:kCellIDSecurityLayer
-                                                                                       forIndexPath:indexPath];
-    securityLayerCell.switchViewButton.isOn = self.loginModel.isSecureLayer;
-    
-    __weak typeof(self) weakSelf = self;
-    [self.kvoManager observeObject:securityLayerCell.switchViewButton
-                        forKeyPath:NSStringFromSelector(@selector(isOn))
-                           options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
-                             block:^(id observer, id object, NSDictionary *change) {
-                                 __strong typeof(self) strongSelf = weakSelf;
-                                 
-                                 // Avoid updating the login model for the same key values
-                                 if ([change[NSKeyValueChangeNewKey] boolValue] != [change[NSKeyValueChangeOldKey] boolValue]) {
-                                     BOOL isHTTPS = [change[NSKeyValueChangeNewKey] boolValue];
-                                     
-                                     [strongSelf.loginModel updateCommunicationOverSecureLayer:isHTTPS];
-                                     [strongSelf.loginModel updatePortEntry:isHTTPS ? [@(kDefaultLoginSecuredPort) stringValue] : [@(kDefaultLoginUnsecuredPort) stringValue]];
-                                     
-                                     [strongSelf.credentialsTableView reloadRowsAtIndexPaths:
-                                      @[[NSIndexPath indexPathForRow:AFAPremiseLoginAdvancedCredentialsCellTypePort
-                                                           inSection:AFAPremiseLoginSectionTypeAdvanced]]
-                                                                            withRowAnimation:UITableViewRowAnimationFade];
-                                 }
-                             }];
-    
-    return securityLayerCell;
-}
-
-- (AFACredentialTextFieldTableViewCell *)dequeueHostNameCellForTableView:(UITableView *)tableView
-                                                               indexPath:(NSIndexPath *)indexPath {
-    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
-                                                                                        forIndexPath:indexPath];
-    credentialCell.delegate = self;
-    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.hostnameAttributedPlaceholderText;
-    credentialCell.inputTextField.text = self.loginModel.hostName;
-    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderHostname;
-    [self registerStateHandlerForCredentialCell:credentialCell];
-    
-    return credentialCell;
-}
-
-- (AFACredentialTextFieldTableViewCell *)dequeueEmailCellForTableView:(UITableView *)tableView
-                                                            indexPath:(NSIndexPath *)indexPath {
-    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
-                                                                                          forIndexPath:indexPath];
-    credentialCell.delegate = self;
-    
-    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.usernameAttributedPlaceholderText;
-    credentialCell.inputTextField.text = self.loginModel.username;
-    credentialCell.inputTextField.keyboardType = UIKeyboardTypeEmailAddress;
-    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderUsername;
-    [self registerStateHandlerForCredentialCell:credentialCell];
-    
-    return credentialCell;
-}
-
-- (AFACredentialTextFieldTableViewCell *)dequeuePasswordCellForTableView:(UITableView *)tableView
-                                                               indexPath:(NSIndexPath *)indexPath {
-    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
-                                                                                          forIndexPath:indexPath];
-    credentialCell.delegate = self;
-    
-    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.passwordAttributedPlaceholderText;
-    credentialCell.inputTextField.text = self.loginModel.password;
-    credentialCell.inputTextField.secureTextEntry = YES;
-    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderPassword;
-    credentialCell.inputTextField.returnKeyType = (AFALoginCredentialsTypeCloud == self.loginType) ? UIReturnKeyDone : UIReturnKeyNext;
-    credentialCell.cellType = AFACredentialTextFieldCellTypeSecured;
-    [self registerStateHandlerForCredentialCell:credentialCell];
-    
-    return credentialCell;
-}
-
-- (AFACredentialTextFieldTableViewCell *)dequeuePortCellForTableView:(UITableView *)tableView
-                                                           indexPath:(NSIndexPath *)indexPath {
-    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
-                                                                                          forIndexPath:indexPath];
-    credentialCell.delegate = self;
-    
-    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.portAttributedPlaceholderText;
-    credentialCell.inputTextField.text = self.loginModel.port;
-    credentialCell.inputTextField.keyboardType = UIKeyboardTypeNumberPad;
-    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderPort;
-    credentialCell.cellType = AFACredentialTextFieldCellTypeUnsecured;
-    [self registerStateHandlerForCredentialCell:credentialCell];
-    
-    return credentialCell;
-}
-
-- (AFACredentialTextFieldTableViewCell *)dequeueServiceDocumentCellForTableView:(UITableView *)tableView
-                                                                      indexPath:(NSIndexPath *)indexPath {
-    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
-                                                                                          forIndexPath:indexPath];
-    credentialCell.delegate = self;
-    
-    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.serviceDocumentAttributedPlaceholderText;
-    credentialCell.inputTextField.text =self.loginModel.serviceDocument;
-    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderServiceDocument;
-    credentialCell.inputTextField.returnKeyType = UIReturnKeyDone;
-    [self registerStateHandlerForCredentialCell:credentialCell];
-    
-    return credentialCell;
-}
-
-- (AFARememberCredentialsTableViewCell *)dequeueRememberCredentialsCellForTableView:(UITableView *)tableView
-                                                                          indexPath:(NSIndexPath *)indexPath {
-    AFARememberCredentialsTableViewCell *rememberCredentialsCell = [tableView dequeueReusableCellWithIdentifier:kCellIDRememberCredentials
-                                                                                                   forIndexPath:indexPath];
-    rememberCredentialsCell.checkBox.selected = self.loginModel.rememberCredentials;
-    
-    __weak typeof(self) weakSelf = self;
-    [self.kvoManager observeObject:rememberCredentialsCell.checkBox
-                        forKeyPath:@"selected"
-                           options:NSKeyValueObservingOptionNew
-                             block:^(id observer, id object, NSDictionary *change) {
-                                 __strong typeof(self) strongSelf = weakSelf;
-                                 [strongSelf.loginModel updateRememberCredentials:[change[NSKeyValueChangeNewKey] boolValue]];
-                             }];
-    
-    return rememberCredentialsCell;
-}
-
-- (AFASignInTableViewCell *)dequeueSignInCellForTableView:(UITableView *)tableView {
-    AFASignInTableViewCell *signInCell = [tableView dequeueReusableCellWithIdentifier:kCellIDSignInButton];
-    signInCell.delegate = self;
-    
-    return signInCell;
-}
-
 @end
diff --git a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginViewController.m b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginViewController.m
index aff8a460..6eaca1b5 100644
--- a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginViewController.m
+++ b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/AFALoginViewController.m
@@ -27,7 +27,7 @@
 #import "UIView+AFAViewAnimations.h"
 
 // Models
-#import "AFALoginModel.h"
+#import "AFALoginViewModel.h"
 
 // View controllers
 #import "AFACredentialsPageViewController.h"
@@ -74,10 +74,10 @@ @interface AFALoginViewController ()
 @property (strong, nonatomic) AFACredentialsPageViewController  *credentialsPageViewController;
 
 // Models
-@property (strong, nonatomic) AFALoginModel                     *loginModel;
+@property (strong, nonatomic) AFALoginViewModel                 *loginViewModel;
 
 // KVO
-@property (strong, nonatomic) ASDKKVOManager                     *kvoManager;
+@property (strong, nonatomic) ASDKKVOManager                    *kvoManager;
 
 @end
 
@@ -87,13 +87,15 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
     
     if (self) {
-        self.loginModel = [AFALoginModel new];
+        _loginViewModel = [AFALoginViewModel new];
+        _kvoManager = [ASDKKVOManager managerWithObserver:self];
     }
     
     return self;
 }
 
 - (void)dealloc {
+#warning Investigate on whether to use the NSNotificationCenter approach of KVOManager one
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
@@ -116,7 +118,7 @@ - (void)viewDidAppear:(BOOL)animated {
     
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *authenticationIdentifier = [userDefaults objectForKey:kAuthentificationTypeCredentialIdentifier];
-    AFALoginViewModelAuthentificationType lastAuthetificationType = [authenticationIdentifier isEqualToString:kCloudAuthetificationCredentialIdentifier] ? AFALoginViewModelAuthentificationTypeCloud : AFALoginViewModelAuthentificationTypePremise;
+    AFALoginAuthenticationType lastAuthetificationType = [authenticationIdentifier isEqualToString:kCloudAuthetificationCredentialIdentifier] ? AFALoginAuthenticationTypeCloud : AFALoginAuthenticationTypePremise;
     
     // Check if we have registered credentials and if so login the user
     // without showing the menu
@@ -124,35 +126,36 @@ - (void)viewDidAppear:(BOOL)animated {
     // this means the app is freshly installed and even if credentials are registered with
     // the keychain do not fetch them
     if (authenticationIdentifier.length) {
-        [self.loginModel updateUserNameEntry:[AFAKeychainWrapper keychainStringFromMatchingIdentifier:kUsernameCredentialIdentifier]];
-        [self.loginModel updatePasswordEntry:[AFAKeychainWrapper keychainStringFromMatchingIdentifier:kPasswordCredentialIdentifier]];
+        [self.loginViewModel updateUserNameEntry:[AFAKeychainWrapper keychainStringFromMatchingIdentifier:kUsernameCredentialIdentifier]];
+        [self.loginViewModel updatePasswordEntry:[AFAKeychainWrapper keychainStringFromMatchingIdentifier:kPasswordCredentialIdentifier]];
     }
     
-    BOOL areCredentialsAvailableFromKeychain = self.loginModel.username.length && self.loginModel.password.length;
+    BOOL areCredentialsAvailableFromKeychain = self.loginViewModel.username.length && self.loginViewModel.password.length;
     
-    if (AFALoginViewModelAuthentificationTypeCloud == lastAuthetificationType &&
+    if (AFALoginAuthenticationTypeCloud == lastAuthetificationType &&
         areCredentialsAvailableFromKeychain) {
-        [self.loginModel updateHostNameEntry:[userDefaults objectForKey:kCloudHostNameCredentialIdentifier]];
-        [self.loginModel updateCommunicationOverSecureLayer:[userDefaults boolForKey:kCloudSecureLayerCredentialIdentifier]];
+        [self.loginViewModel updateHostNameEntry:[userDefaults objectForKey:kCloudHostNameCredentialIdentifier]];
+        [self.loginViewModel updateCommunicationOverSecureLayer:[userDefaults boolForKey:kCloudSecureLayerCredentialIdentifier]];
     } else {
-        [self.loginModel updateHostNameEntry:[userDefaults objectForKey:kPremiseHostNameCredentialIdentifier]];
-        [self.loginModel updateCommunicationOverSecureLayer:[userDefaults boolForKey:kPremiseSecureLayerCredentialIdentifier]];
+        [self.loginViewModel updateHostNameEntry:[userDefaults objectForKey:kPremiseHostNameCredentialIdentifier]];
+        [self.loginViewModel updateCommunicationOverSecureLayer:[userDefaults boolForKey:kPremiseSecureLayerCredentialIdentifier]];
         NSString *cachedPortString = [userDefaults objectForKey:kPremisePortCredentialIdentifier];
         if (!cachedPortString.length) {
             cachedPortString = [@(kDefaultLoginUnsecuredPort) stringValue];
         }
-        [self.loginModel updatePortEntry:cachedPortString];
+        [self.loginViewModel updatePortEntry:cachedPortString];
         
         // If there is no stored value for the service document key, then fallback to the one provided inside the login model
         // at initialization time
         NSString *serviceDocumentValue = [userDefaults objectForKey:kPremiseServiceDocumentCredentialIdentifier];
         if (serviceDocumentValue.length) {
-            [self.loginModel updateServiceDocument:serviceDocumentValue];
+            [self.loginViewModel updateServiceDocument:serviceDocumentValue];
         }
     }
     
-    if ([self.loginModel canUserSignIn]) {
-        [self.loginModel requestLoginWithCompletionBlock:^(BOOL isLoggedIn, NSError *error) {
+    if ([self.loginViewModel canUserSignIn]) {
+        [self handleBindingsForLoginViewModel:self.loginViewModel];
+        [self.loginViewModel requestLoginWithCompletionBlock:^(BOOL isLoggedIn, NSError *error) {
             BOOL displayEnvironmentMenu = NO;
             if (!error) {
                 if (!isLoggedIn) {
@@ -174,7 +177,6 @@ - (void)viewDidAppear:(BOOL)animated {
                 });
             }
         }];
-        
     } else { // Show the enviroment menu options
         [UIView animateViewsFromArray:@[self.roundedViewsContainer, self.serverButtonsContainerView]
                             withAlpha:1.0f
@@ -199,13 +201,13 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue
     // Get a hold of the reference for the embedded page view controller
     if ([kStoryboardIDEmbeddedCredentialsPageController isEqualToString:segue.identifier]) {
         self.credentialsPageViewController = segue.destinationViewController;
-        self.credentialsPageViewController.loginModel = self.loginModel;
-        [self handleBindingsForLoginViewController];
+        [self handleBindingsForLoginViewModel:self.credentialsPageViewController.cloudLoginViewModel];
+        [self handleBindingsForLoginViewModel:self.credentialsPageViewController.premiseLoginViewModel];
     }
     
     if ([kSegueIDLoginAuthorized isEqualToString:segue.identifier]) {
         AFAContainerViewController *containerViewController = segue.destinationViewController;
-        containerViewController.loginModel = self.loginModel;
+        containerViewController.loginViewModel = self.loginViewModel;
     }
 }
 
@@ -249,11 +251,11 @@ - (IBAction)onActivitiPremise:(id)sender {
 
 - (IBAction)onEnvironment:(id)sender {
     // Cancel possible ongoing login request
-    [self.loginModel cancelLoginRequest];
+    [self.loginViewModel cancelLoginRequest];
     
     // Clear credential information
-    [self.loginModel updateUserNameEntry:nil];
-    [self.loginModel updatePasswordEntry:nil];
+    [self.loginViewModel updateUserNameEntry:nil];
+    [self.loginViewModel updatePasswordEntry:nil];
     
     [self showEnvironmentPageAnimation];
 }
@@ -362,11 +364,9 @@ - (void)showEnvironmentPageAnimation {
 #pragma mark -
 #pragma mark KVO bindings
 
-- (void)handleBindingsForLoginViewController {
-    self.kvoManager = [ASDKKVOManager managerWithObserver:self];
-    
+- (void)handleBindingsForLoginViewModel:(AFALoginViewModel *)loginViewModel {
     __weak typeof(self) weakSelf = self;
-    [self.kvoManager observeObject:self.loginModel
+    [self.kvoManager observeObject:loginViewModel
                         forKeyPath:NSStringFromSelector(@selector(isCredentialInputInProgress))
                            options:NSKeyValueObservingOptionNew
                              block:^(id observer, id object, NSDictionary *change) {
@@ -377,24 +377,24 @@ - (void)handleBindingsForLoginViewController {
                                  });
                              }];
     
-    [self.kvoManager observeObject:self.loginModel
+    [self.kvoManager observeObject:loginViewModel
                         forKeyPath:NSStringFromSelector(@selector(authState))
                            options:NSKeyValueObservingOptionNew
                              block:^(id observer, id object, NSDictionary *change) {
-                                 AFALoginViewModelAuthentificationState authState = [change[NSKeyValueChangeNewKey] unsignedIntegerValue];
+                                 AFALoginAuthenticationState authState = [change[NSKeyValueChangeNewKey] unsignedIntegerValue];
                                  
                                  dispatch_async(dispatch_get_main_queue(), ^{
-                                     if (AFALoginViewModelAuthentificationStateLoggedOut == authState) {
+                                     if (AFALoginAuthenticationStateLoggedOut == authState) {
                                          [weakSelf showEnvironmentPageAnimation];
                                          return ;
                                      }
                                      
                                      // If the user performed an action asses whether an animation is needed
-                                     if (AFALoginViewModelAuthentificationStatePreparing != authState) {
-                                         [weakSelf performActivityAnimationInReverse:(AFALoginViewModelAuthentificationStateInProgress == authState) ? NO : YES];
+                                     if (AFALoginAuthenticationStatePreparing != authState) {
+                                         [weakSelf performActivityAnimationInReverse:(AFALoginAuthenticationStateInProgress == authState) ? NO : YES];
                                      }
                                      
-                                     if (AFALoginViewModelAuthentificationStateAuthorized == authState) {
+                                     if (AFALoginAuthenticationStateAuthorized == authState) {
                                          [weakSelf performSegueWithIdentifier:kSegueIDLoginAuthorized
                                                                    sender:nil];
                                      }
diff --git a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.h b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.h
new file mode 100644
index 00000000..35c00665
--- /dev/null
+++ b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.h
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (C) 2005-2017 Alfresco Software Limited.
+ *
+ * This file is part of the Alfresco Activiti Mobile iOS App.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************/
+
+#import <Foundation/Foundation.h>
+#import "AFALoginViewModel.h"
+
+// Enumerations
+typedef NS_ENUM(NSInteger, AFACloudLoginSectionType) {
+    AFACloudLoginSectionTypeAccountDetails,
+    AFACloudLoginSectionTypeSignIn,
+    AFACloudLoginSectionTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFAPremiseLoginSectionType) {
+    AFAPremiseLoginSectionTypeAccountDetails = 0,
+    AFAPremiseLoginSectionTypeAdvanced,
+    AFAPremiseLoginSectionTypeSignIn,
+    AFAPremiseLoginSectionTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFACloudLoginCredentialsCellType) {
+    AFACloudLoginCredentialsCellTypeEmail = 0,
+    AFACloudLoginCredentialsCellTypePassword,
+    AFACloudLoginCredentialsCellTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFAPremiseLoginCredentialsCellType) {
+    AFAPremiseLoginCredentialsCellTypeEmail = 0,
+    AFAPremiseLoginCredentialsCellTypePassword,
+    AFAPremiseLoginCredentialsCellTypeHostname,
+    AFAPremiseLoginCredentialsCellTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFAPremiseLoginAdvancedCredentialsCellType) {
+    AFAPremiseLoginAdvancedCredentialsCellTypeSecurityLayer = 0,
+    AFAPremiseLoginAdvancedCredentialsCellTypePort,
+    AFAPremiseLoginAdvancedCredentialsCellTypeServiceDocument,
+    AFAPremiseLoginAdvancedCredentialsCellTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFASignInSectionCellType) {
+    AFASignInSectionCellTypeRememberCredentials = 0,
+    AFASignInSectionCellTypeSignIn,
+    AFASignInSectionCellTypeEnumCount
+};
+
+typedef NS_ENUM(NSInteger, AFALoginCredentialsFocusFieldOrder) {
+    AFALoginCredentialsFocusFieldOrderUsername = 0,
+    AFALoginCredentialsFocusFieldOrderPassword,
+    AFALoginCredentialsFocusFieldOrderHostname,
+    AFALoginCredentialsFocusFieldOrderPort,
+    AFALoginCredentialsFocusFieldOrderServiceDocument
+};
+
+// Enumerations
+typedef NS_OPTIONS(NSUInteger, AFALoginCredentialEditing) {
+    AFALoginCredentialEditingFirstField  = 1<<0,
+    AFALoginCredentialEditingSecondField = 1<<1,
+};
+
+@protocol AFALoginCredentialsViewControllerDataSourceDelegate <NSObject>
+
+- (void)jumpFromTextField:(UITextField *)fromTextField
+   toNextTextFieldWithTag:(NSUInteger)tag;
+- (void)lockInterface:(BOOL)lockInterface;
+- (void)handleNetworkErrorWithMessage:(NSString *)errorMessage;
+
+@end
+
+@protocol AFALoginCredentialsViewControllerDataSource <NSObject, UITableViewDataSource>
+
+@property (strong, nonatomic, readonly) AFALoginViewModel                           *loginModel;
+@property (weak, nonatomic) id<AFALoginCredentialsViewControllerDataSourceDelegate> delegate;
+
+- (instancetype)initWithLoginModel:(AFALoginViewModel *)loginModel;
+
+@end
+
+@interface AFALoginCredentialsViewControllerDataSource : NSObject <AFALoginCredentialsViewControllerDataSource>
+
+@property (strong, nonatomic, readonly) AFALoginViewModel                           *loginModel;
+@property (weak, nonatomic) id<AFALoginCredentialsViewControllerDataSourceDelegate> delegate;
+
+@end
diff --git a/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.m b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.m
new file mode 100644
index 00000000..7310b213
--- /dev/null
+++ b/AlfrescoActiviti/UI/ViewControllers/LoginScreen/DataSource/AFALoginCredentialsViewControllerDataSource.m
@@ -0,0 +1,511 @@
+/*******************************************************************************
+ * Copyright (C) 2005-2017 Alfresco Software Limited.
+ *
+ * This file is part of the Alfresco Activiti Mobile iOS App.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ ******************************************************************************/
+
+#import "AFALoginCredentialsViewControllerDataSource.h"
+
+// Constants
+#import "AFALocalizationConstants.h"
+#import "AFAUIConstants.h"
+#import "AFABusinessConstants.h"
+
+// Cells
+#import "AFACredentialTextFieldTableViewCell.h"
+#import "AFASignInTableViewCell.h"
+#import "AFARememberCredentialsTableViewCell.h"
+#import "AFASecurityLayerTableViewCell.h"
+
+@interface AFALoginCredentialsViewControllerDataSource () <AFACredentialTextFieldTableViewCellDelegate,
+                                                           AFASignInButtonDelegate>
+
+@property (assign, nonatomic) AFALoginCredentialEditing     credentialEditing;
+
+// KVO
+@property (strong, nonatomic) ASDKKVOManager                *kvoManager;
+
+@end
+
+@implementation AFALoginCredentialsViewControllerDataSource
+
+- (instancetype)initWithLoginModel:(AFALoginViewModel *)loginModel {
+    self = [super init];
+    
+    if (self) {
+        _loginModel = loginModel;
+        _loginModel.authState = AFALoginAuthenticationStatePreparing;
+        _kvoManager = [ASDKKVOManager managerWithObserver:self];
+    }
+    
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark AFACredentialTextFieldTableViewCellDelegate
+
+- (void)inputTextFieldWillBeginEditting:(UITextField *)inputTextField
+                                 inCell:(UITableViewCell *)cell{
+    // First field is already being edited
+    if (self.credentialEditing & AFALoginCredentialEditingFirstField) {
+        self.credentialEditing |= AFALoginCredentialEditingSecondField;
+    } else if (self.credentialEditing & AFALoginCredentialEditingSecondField) { // Second field is already being edited
+        self.credentialEditing |= AFALoginCredentialEditingFirstField;
+    } else {
+        self.credentialEditing |= AFALoginCredentialEditingFirstField;
+    }
+    
+    self.loginModel.isCredentialInputInProgress = YES;
+}
+
+- (void)inputTextFieldWillEndEditting:(UITextField *)inputTextField
+                               inCell:(UITableViewCell *)cell{
+    // Stop editing first field
+    if (self.credentialEditing & AFALoginCredentialEditingFirstField) {
+        self.credentialEditing &= ~AFALoginCredentialEditingFirstField;
+    } else if (self.credentialEditing & AFALoginCredentialEditingSecondField) { // Stop editing the second field
+        self.credentialEditing &= ~AFALoginCredentialEditingSecondField;
+    }
+    
+    // Check and update final state - no other fields being edited
+    if (!(self.credentialEditing & AFALoginCredentialEditingFirstField) &&
+        !(self.credentialEditing & AFALoginCredentialEditingSecondField)) {
+        self.loginModel.isCredentialInputInProgress = NO;
+    }
+}
+
+- (void)inputTextFieldShouldReturn:(UITextField *)inputTextField
+                            inCell:(UITableViewCell *)cell {
+    NSInteger nextTag = inputTextField.tag + 1;
+    
+    if ([self.delegate respondsToSelector:@selector(jumpFromTextField:toNextTextFieldWithTag:)]) {
+        [self.delegate jumpFromTextField:inputTextField
+                  toNextTextFieldWithTag:nextTag];
+    }
+}
+
+
+#pragma mark -
+#pragma mark AFASignInButton Delegate
+
+- (void)onSignIn:(id)sender
+        fromCell:(UITableViewCell *)cell {
+    self.loginModel.isCredentialInputInProgress = NO;
+    
+    // If the login type is of cloud type then update the model with
+    // the default host name and security layer
+    if (AFALoginAuthenticationTypeCloud == self.loginModel.authentificationType) {
+        [self.loginModel updateHostNameEntry:kActivitiCloudHostName];
+        [self.loginModel updateCommunicationOverSecureLayer:YES];
+        [self.loginModel updatePortEntry:nil];
+    }
+    
+    // Do all mandatory fields have informations needed in order to login
+    if ([self.loginModel canUserSignIn]) {
+        if ([self.delegate respondsToSelector:@selector(lockInterface:)]) {
+            [self.delegate lockInterface:YES];
+        }
+        
+        __weak typeof(self) weakSelf = self;
+        [self.loginModel requestLoginWithCompletionBlock:^(BOOL isLoggedIn, NSError *error) {
+            __strong typeof(self) strongSelf = weakSelf;
+            if ([strongSelf.delegate respondsToSelector:@selector(lockInterface:)]) {
+                [strongSelf.delegate lockInterface:NO];
+            }
+            
+            // Notify the user about the error
+            NSInteger responseCode = 0;
+            if (error) {
+                NSError *underlayingError = error.userInfo[NSUnderlyingErrorKey];
+                if (underlayingError) {
+                    responseCode = [[underlayingError.userInfo objectForKey:AFNetworkingOperationFailingURLResponseErrorKey] statusCode];
+                    if (!responseCode) {
+                        responseCode = underlayingError.code;
+                    }
+                } else {
+                    NSHTTPURLResponse *urlResponse = error.userInfo[AFNetworkingOperationFailingURLResponseErrorKey];
+                    responseCode = urlResponse.statusCode;
+                }
+                
+                NSString *networkErrorMessage = nil;
+                
+                switch (responseCode) {
+                    case ASDKHTTPCode401Unauthorised:
+                    case ASDKHTTPCode403Forbidden: {
+                        networkErrorMessage = NSLocalizedString(kLocalizationLoginInvalidCredentialsText, @"Invalid credentials text");
+                    }
+                        break;
+                        
+                    case NSURLErrorCannotConnectToHost: {
+                        networkErrorMessage = NSLocalizedString(kLocalizationLoginUnreachableHostText, @"Unreachable host text");
+                    }
+                        break;
+                        
+                    case NSURLErrorTimedOut: {
+                        networkErrorMessage = NSLocalizedString(kLocalizationLoginTimedOutText, @"Login timed out text");
+                    }
+                        break;
+                        
+                    default:
+                        break;
+                }
+                
+                if ([strongSelf.delegate respondsToSelector:@selector(handleNetworkErrorWithMessage:)]) {
+                    [strongSelf.delegate handleNetworkErrorWithMessage:networkErrorMessage];
+                }
+                
+                [(AFASignInTableViewCell *)cell shakeSignInButton];
+            }
+        }];
+    } else {
+        // Notify the user that something is wrong
+        [(AFASignInTableViewCell *)cell shakeSignInButton];
+    }
+}
+
+
+#pragma mark -
+#pragma mark UITableViewDataSource
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    // For the cloud login we just have 2 sections, a simple username / password pair of fields
+    // and the sign in section
+    return (AFALoginAuthenticationTypePremise == self.loginModel.authentificationType) ? AFAPremiseLoginSectionTypeEnumCount : 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    NSInteger rowCount = 0;
+    
+    switch (self.loginModel.authentificationType) {
+        case AFALoginAuthenticationTypeCloud: {
+            if (AFACloudLoginSectionTypeAccountDetails == section) {
+                rowCount = AFACloudLoginCredentialsCellTypeEnumCount;
+            } else {
+                rowCount = AFASignInSectionCellTypeEnumCount;
+            }
+        }
+            break;
+            
+        case AFALoginAuthenticationTypePremise: {
+            if (AFAPremiseLoginSectionTypeAccountDetails == section) {
+                rowCount = AFAPremiseLoginCredentialsCellTypeEnumCount;
+            } else if (AFAPremiseLoginSectionTypeAdvanced == section) {
+                rowCount = AFAPremiseLoginAdvancedCredentialsCellTypeEnumCount;
+            } else {
+                rowCount = AFASignInSectionCellTypeEnumCount;
+            }
+        }
+            break;
+            
+        default:
+            break;
+    }
+    
+    return rowCount;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = nil;
+    
+    // Check if we're presenting a premise or cloud screen
+    if (AFALoginAuthenticationTypePremise == self.loginModel.authentificationType) {
+        
+        // Handle the dequeuing of each section that make up the premise login
+        if (AFAPremiseLoginSectionTypeAccountDetails == indexPath.section) {
+            switch (indexPath.row) {
+                case AFAPremiseLoginCredentialsCellTypeHostname: {
+                    cell = [self dequeueHostNameCellForTableView:tableView
+                                                       indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFAPremiseLoginCredentialsCellTypeEmail: {
+                    cell = [self dequeueEmailCellForTableView:tableView
+                                                    indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFAPremiseLoginCredentialsCellTypePassword: {
+                    cell = [self dequeuePasswordCellForTableView:tableView
+                                                       indexPath:indexPath];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+        } else if (AFAPremiseLoginSectionTypeAdvanced == indexPath.section) {
+            switch (indexPath.row) {
+                case AFAPremiseLoginAdvancedCredentialsCellTypeSecurityLayer: {
+                    cell = [self dequeueSecurityLayerCellForTableView:tableView
+                                                            indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFAPremiseLoginAdvancedCredentialsCellTypePort: {
+                    cell = [self dequeuePortCellForTableView:tableView
+                                                   indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFAPremiseLoginAdvancedCredentialsCellTypeServiceDocument: {
+                    cell = [self dequeueServiceDocumentCellForTableView:tableView
+                                                              indexPath:indexPath];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+        } else {
+            switch (indexPath.row) {
+                case AFASignInSectionCellTypeRememberCredentials: {
+                    cell = [self dequeueRememberCredentialsCellForTableView:tableView
+                                                                  indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFASignInSectionCellTypeSignIn: {
+                    cell = [self dequeueSignInCellForTableView:tableView];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+        }
+    } else {
+        // Handle the dequeuing of each section that make up the cloud login
+        if (AFACloudLoginSectionTypeAccountDetails == indexPath.section) {
+            switch (indexPath.row) {
+                case AFACloudLoginCredentialsCellTypeEmail: {
+                    cell = [self dequeueEmailCellForTableView:tableView
+                                                    indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFACloudLoginCredentialsCellTypePassword: {
+                    cell = [self dequeuePasswordCellForTableView:tableView
+                                                       indexPath:indexPath];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+        } else {
+            switch (indexPath.row) {
+                case AFASignInSectionCellTypeRememberCredentials: {
+                    cell = [self dequeueRememberCredentialsCellForTableView:tableView
+                                                                  indexPath:indexPath];
+                }
+                    break;
+                    
+                case AFASignInSectionCellTypeSignIn: {
+                    cell = [self dequeueSignInCellForTableView:tableView];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+        }
+    }
+    
+    cell.backgroundColor = [UIColor clearColor];
+    
+    return cell;
+}
+
+
+#pragma mark -
+#pragma mark Cell builders
+
+- (void)registerStateHandlerForCredentialCell:(AFACredentialTextFieldTableViewCell *)credentialCell {
+    __weak typeof(self) weakSelf = self;
+    [self.kvoManager observeObject:credentialCell
+                        forKeyPath:NSStringFromSelector(@selector(inputText))
+                           options:NSKeyValueObservingOptionNew
+                             block:^(id observer, id object, NSDictionary *change) {
+                                 __strong typeof(self) strongSelf = weakSelf;
+                                 
+                                 switch (credentialCell.inputTextField.tag) {
+                                     case AFALoginCredentialsFocusFieldOrderUsername: {
+                                         [strongSelf.loginModel updateUserNameEntry:change[NSKeyValueChangeNewKey]];
+                                     }
+                                         break;
+                                         
+                                     case AFALoginCredentialsFocusFieldOrderPassword: {
+                                         [strongSelf.loginModel updatePasswordEntry:change[NSKeyValueChangeNewKey]];
+                                     }
+                                         break;
+                                         
+                                     case AFALoginCredentialsFocusFieldOrderHostname: {
+                                         [strongSelf.loginModel updateHostNameEntry:change[NSKeyValueChangeNewKey]];
+                                     }
+                                         break;
+                                         
+                                     case AFALoginCredentialsFocusFieldOrderPort: {
+                                         [strongSelf.loginModel updatePortEntry:change[NSKeyValueChangeNewKey]];
+                                     }
+                                         break;
+                                         
+                                     case AFALoginCredentialsFocusFieldOrderServiceDocument: {
+                                         [strongSelf.loginModel updateServiceDocument:change[NSKeyValueChangeNewKey]];
+                                     }
+                                         break;
+                                         
+                                     default:
+                                         break;
+                                 }
+                             }];
+}
+
+- (AFASecurityLayerTableViewCell *)dequeueSecurityLayerCellForTableView:(UITableView *)tableView
+                                                              indexPath:(NSIndexPath *)indexPath {
+    AFASecurityLayerTableViewCell *securityLayerCell = [tableView dequeueReusableCellWithIdentifier:kCellIDSecurityLayer
+                                                                                       forIndexPath:indexPath];
+    securityLayerCell.switchViewButton.isOn = self.loginModel.isSecureLayer;
+    
+    __weak typeof(self) weakSelf = self;
+    [self.kvoManager observeObject:securityLayerCell.switchViewButton
+                        forKeyPath:NSStringFromSelector(@selector(isOn))
+                           options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
+                             block:^(id observer, id object, NSDictionary *change) {
+                                 __strong typeof(self) strongSelf = weakSelf;
+                                 
+                                 // Avoid updating the login model for the same key values
+                                 if ([change[NSKeyValueChangeNewKey] boolValue] != [change[NSKeyValueChangeOldKey] boolValue]) {
+                                     BOOL isHTTPS = [change[NSKeyValueChangeNewKey] boolValue];
+                                     
+                                     [strongSelf.loginModel updateCommunicationOverSecureLayer:isHTTPS];
+                                     [strongSelf.loginModel updatePortEntry:isHTTPS ? [@(kDefaultLoginSecuredPort) stringValue] : [@(kDefaultLoginUnsecuredPort) stringValue]];
+                                     
+                                     [tableView reloadRowsAtIndexPaths:
+                                      @[[NSIndexPath indexPathForRow:AFAPremiseLoginAdvancedCredentialsCellTypePort
+                                                           inSection:AFAPremiseLoginSectionTypeAdvanced]]
+                                                      withRowAnimation:UITableViewRowAnimationFade];
+                                 }
+                             }];
+    
+    return securityLayerCell;
+}
+
+- (AFACredentialTextFieldTableViewCell *)dequeueHostNameCellForTableView:(UITableView *)tableView
+                                                               indexPath:(NSIndexPath *)indexPath {
+    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
+                                                                                          forIndexPath:indexPath];
+    credentialCell.delegate = self;
+    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.hostnameAttributedPlaceholderText;
+    credentialCell.inputTextField.text = self.loginModel.hostName;
+    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderHostname;
+    [self registerStateHandlerForCredentialCell:credentialCell];
+    
+    return credentialCell;
+}
+
+- (AFACredentialTextFieldTableViewCell *)dequeueEmailCellForTableView:(UITableView *)tableView
+                                                            indexPath:(NSIndexPath *)indexPath {
+    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
+                                                                                          forIndexPath:indexPath];
+    credentialCell.delegate = self;
+    
+    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.usernameAttributedPlaceholderText;
+    credentialCell.inputTextField.text = self.loginModel.username;
+    credentialCell.inputTextField.keyboardType = UIKeyboardTypeEmailAddress;
+    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderUsername;
+    [self registerStateHandlerForCredentialCell:credentialCell];
+    
+    return credentialCell;
+}
+
+- (AFACredentialTextFieldTableViewCell *)dequeuePasswordCellForTableView:(UITableView *)tableView
+                                                               indexPath:(NSIndexPath *)indexPath {
+    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
+                                                                                          forIndexPath:indexPath];
+    credentialCell.delegate = self;
+    
+    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.passwordAttributedPlaceholderText;
+    credentialCell.inputTextField.text = self.loginModel.password;
+    credentialCell.inputTextField.secureTextEntry = YES;
+    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderPassword;
+    credentialCell.inputTextField.returnKeyType = (AFALoginAuthenticationTypeCloud == self.loginModel.authentificationType) ? UIReturnKeyDone : UIReturnKeyNext;
+    credentialCell.cellType = AFACredentialTextFieldCellTypeSecured;
+    [self registerStateHandlerForCredentialCell:credentialCell];
+    
+    return credentialCell;
+}
+
+- (AFACredentialTextFieldTableViewCell *)dequeuePortCellForTableView:(UITableView *)tableView
+                                                           indexPath:(NSIndexPath *)indexPath {
+    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
+                                                                                          forIndexPath:indexPath];
+    credentialCell.delegate = self;
+    
+    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.portAttributedPlaceholderText;
+    credentialCell.inputTextField.text = self.loginModel.port;
+    credentialCell.inputTextField.keyboardType = UIKeyboardTypeNumberPad;
+    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderPort;
+    credentialCell.cellType = AFACredentialTextFieldCellTypeUnsecured;
+    [self registerStateHandlerForCredentialCell:credentialCell];
+    
+    return credentialCell;
+}
+
+- (AFACredentialTextFieldTableViewCell *)dequeueServiceDocumentCellForTableView:(UITableView *)tableView
+                                                                      indexPath:(NSIndexPath *)indexPath {
+    AFACredentialTextFieldTableViewCell *credentialCell = [tableView dequeueReusableCellWithIdentifier:kCellIDCredentialTextField
+                                                                                          forIndexPath:indexPath];
+    credentialCell.delegate = self;
+    
+    credentialCell.inputTextField.attributedPlaceholder = self.loginModel.serviceDocumentAttributedPlaceholderText;
+    credentialCell.inputTextField.text =self.loginModel.serviceDocument;
+    credentialCell.inputTextField.tag = AFALoginCredentialsFocusFieldOrderServiceDocument;
+    credentialCell.inputTextField.returnKeyType = UIReturnKeyDone;
+    [self registerStateHandlerForCredentialCell:credentialCell];
+    
+    return credentialCell;
+}
+
+- (AFARememberCredentialsTableViewCell *)dequeueRememberCredentialsCellForTableView:(UITableView *)tableView
+                                                                          indexPath:(NSIndexPath *)indexPath {
+    AFARememberCredentialsTableViewCell *rememberCredentialsCell = [tableView dequeueReusableCellWithIdentifier:kCellIDRememberCredentials
+                                                                                                   forIndexPath:indexPath];
+    rememberCredentialsCell.checkBox.selected = self.loginModel.rememberCredentials;
+    
+    __weak typeof(self) weakSelf = self;
+    [self.kvoManager observeObject:rememberCredentialsCell.checkBox
+                        forKeyPath:@"selected"
+                           options:NSKeyValueObservingOptionNew
+                             block:^(id observer, id object, NSDictionary *change) {
+                                 __strong typeof(self) strongSelf = weakSelf;
+                                 [strongSelf.loginModel updateRememberCredentials:[change[NSKeyValueChangeNewKey] boolValue]];
+                             }];
+    
+    return rememberCredentialsCell;
+}
+
+- (AFASignInTableViewCell *)dequeueSignInCellForTableView:(UITableView *)tableView {
+    AFASignInTableViewCell *signInCell = [tableView dequeueReusableCellWithIdentifier:kCellIDSignInButton];
+    signInCell.delegate = self;
+    
+    return signInCell;
+}
+
+
+
+@end