diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt b/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
index c320a2c9e..be85a6531 100644
--- a/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
@@ -18,6 +18,7 @@ import org.rfcx.ranger.data.remote.setusername.SetNameEndpoint
 import org.rfcx.ranger.data.remote.shortlink.ShortLinkEndpoint
 import org.rfcx.ranger.data.remote.site.SiteEndpoint
 import org.rfcx.ranger.data.remote.subscribe.SubscribeEndpoint
+import org.rfcx.ranger.data.remote.terms.TermsEndpoint
 import org.rfcx.ranger.data.remote.usertouch.UserTouchEndPoint
 import org.rfcx.ranger.util.GsonProvider
 import org.rfcx.ranger.util.ImprovedDateTypeAdapter
@@ -101,6 +102,12 @@ object ServiceFactory {
 				.create(SubscribeEndpoint::class.java)
 	}
 	
+	fun makeTermsService(isDebug: Boolean, context: Context): TermsEndpoint {
+		return createRetrofit(BuildConfig.RANGER_DOMAIN, createAuthTokenOkHttpClient(isDebug, AuthTokenInterceptor(context)),
+				GsonProvider.getInstance().gson)
+				.create(TermsEndpoint::class.java)
+	}
+	
 	private fun createRetrofit(baseUrl: String, okHttpClient: OkHttpClient, gson: Gson): Retrofit {
 		return Retrofit.Builder().baseUrl(baseUrl)
 				.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt
new file mode 100644
index 000000000..3cc103161
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt
@@ -0,0 +1,12 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface TermsEndpoint {
+	@POST("v1/users/accept-terms")
+	fun sendPayload(@Body body: TermsRequest): Single<TermsResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt
new file mode 100644
index 000000000..ecf640291
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt
@@ -0,0 +1,9 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+interface TermsRepository {
+	fun sendBodyPayload(sendBody: TermsRequest): Single<TermsResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt
new file mode 100644
index 000000000..187976f79
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt
@@ -0,0 +1,11 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+class TermsRepositoryImp(private val termsEndpoint: TermsEndpoint) : TermsRepository {
+	override fun sendBodyPayload(sendBody: TermsRequest): Single<TermsResponse> {
+		return termsEndpoint.sendPayload(sendBody)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt
new file mode 100644
index 000000000..67ae01425
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt
@@ -0,0 +1,16 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.data.remote.domain.SingleUseCase
+import org.rfcx.ranger.data.remote.domain.executor.PostExecutionThread
+import org.rfcx.ranger.data.remote.domain.executor.ThreadExecutor
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+class TermsUseCase(private val termsRepository: TermsRepository,
+                   threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread
+) : SingleUseCase<TermsRequest, TermsResponse>(threadExecutor, postExecutionThread) {
+	override fun buildUseCaseObservable(params: TermsRequest): Single<TermsResponse> {
+		return termsRepository.sendBodyPayload(params)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/di/DataModule.kt b/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
index 55ff56cba..fbd44af8a 100644
--- a/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
+++ b/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
@@ -50,6 +50,9 @@ import org.rfcx.ranger.data.remote.subscribe.SubscribeUseCase
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeRepository
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeRepositoryImp
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeUseCase
+import org.rfcx.ranger.data.remote.terms.TermsRepository
+import org.rfcx.ranger.data.remote.terms.TermsRepositoryImp
+import org.rfcx.ranger.data.remote.terms.TermsUseCase
 import org.rfcx.ranger.data.remote.usertouch.CheckUserTouchUseCase
 import org.rfcx.ranger.data.remote.usertouch.UserTouchRepository
 import org.rfcx.ranger.data.remote.usertouch.UserTouchRepositoryImp
@@ -110,6 +113,9 @@ object DataModule {
 		single { UnsubscribeRepositoryImp(get()) } bind UnsubscribeRepository::class
 		single { UnsubscribeUseCase(get(), get(), get()) }
 		
+		single { TermsRepositoryImp(get()) } bind TermsRepository::class
+		single { TermsUseCase(get(), get(), get()) }
+		
 	}
 	
 	val remoteModule = module {
@@ -125,6 +131,7 @@ object DataModule {
 		factory { ServiceFactory.makePasswordService(BuildConfig.DEBUG, androidContext()) }
 		factory { ServiceFactory.makeProfilePhotoService(BuildConfig.DEBUG, androidContext()) }
 		factory { ServiceFactory.makeSubscribeService(BuildConfig.DEBUG, androidContext()) }
+		factory { ServiceFactory.makeTermsService(BuildConfig.DEBUG, androidContext()) }
 	}
 	
 	val localModule = module {
diff --git a/app/src/main/java/org/rfcx/ranger/di/UiModule.kt b/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
index b5f354ab9..597d86414 100644
--- a/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
+++ b/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
@@ -14,6 +14,7 @@ import org.rfcx.ranger.view.alerts.guardian.alertType.AlertValueViewModel
 import org.rfcx.ranger.view.login.InvitationCodeViewModel
 import org.rfcx.ranger.view.login.LoginViewModel
 import org.rfcx.ranger.view.login.SetUserNameViewModel
+import org.rfcx.ranger.view.login.TermsAndServiceViewModel
 import org.rfcx.ranger.view.map.MapDetailViewModel
 import org.rfcx.ranger.view.map.MapViewModel
 import org.rfcx.ranger.view.map.ReportViewPagerFragmentViewModel
@@ -67,5 +68,6 @@ object UiModule {
 		viewModel { LoginViewModel(androidContext(), get()) }
 		viewModel { InvitationCodeViewModel(androidContext(), get()) }
 		viewModel { SetUserNameViewModel(androidContext(), get()) }
+		viewModel { TermsAndServiceViewModel(androidContext(), get()) }
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt b/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt
new file mode 100644
index 000000000..76870774d
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt
@@ -0,0 +1,12 @@
+package org.rfcx.ranger.entity.terms
+
+import com.google.gson.annotations.SerializedName
+
+open class TermsRequest(
+		val app: String
+)
+
+open class TermsResponse(
+		@SerializedName("success")
+		val success: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt b/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
index 460a8ca8c..0f8fdbace 100644
--- a/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
+++ b/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
@@ -4,5 +4,11 @@ import com.google.gson.annotations.SerializedName
 
 data class InvitationCodeRequest(
 		@SerializedName("code")
-		val code: String
+		val code: String,
+		
+		@SerializedName("accept_terms")
+		val acceptTerms: String,
+		
+		@SerializedName("app")
+		val app: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt b/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
index 77bb55742..fe3213bf3 100644
--- a/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
+++ b/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
@@ -6,7 +6,7 @@ package org.rfcx.ranger.entity.user
 
 data class UserAuthResponse (val guid: String, val email: String?, val nickname: String?,
                              val idToken: String, val accessToken: String?, val refreshToken: String?,
-                             val roles: Set<String> = setOf(), val accessibleSites: Set<String> = setOf(), val defaultSite: String? = null, val picture: String?) {
+                             val roles: Set<String> = setOf(), val accessibleSites: Set<String> = setOf(), val defaultSite: String? = null, val picture: String?, val consentGivenRangerApp: String?) {
 
     val isRanger: Boolean get() = roles.contains("rfcxUser") && defaultSite != null
 
diff --git a/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt b/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
index 3a354c71e..9bc72b83a 100644
--- a/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
@@ -31,6 +31,9 @@ class CredentialKeeper(val context: Context) {
         if (user.picture != null) {
             preferences.putString(Preferences.IMAGE_PROFILE, user.picture)
         }
+        if (user.consentGivenRangerApp != null) {
+            preferences.putBoolean(Preferences.CONSENT_GIVEN, true)
+        }
         preferences.putStringSet(Preferences.ROLES, user.roles)
         preferences.putStringSet(Preferences.ACCESSIBLE_SITES, user.accessibleSites)
         if (user.defaultSite != null) {
diff --git a/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt b/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
index 9b05d227c..67e6403ec 100644
--- a/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
@@ -24,6 +24,7 @@ class CredentialVerifier(val context: Context) {
 		
 		// Parsing JWT Token
 		val metaDataKey = getString(R.string.auth0_metadata_key)
+		val userMetaDataKey = getString(R.string.auth0_user_metadata_key)
 		val withoutSignature = token.substring(0, token.lastIndexOf('.') + 1)
 		try {
 			val untrusted = Jwts.parser().parseClaimsJwt(withoutSignature)
@@ -64,12 +65,26 @@ class CredentialVerifier(val context: Context) {
 				}
 			}
 			
+			val userUntrusted = Jwts.parser().parseClaimsJwt(withoutSignature)
+			var consentGivenRangerApp: String? = null
+			
+			if (userUntrusted.body[userMetaDataKey] == null) {
+				consentGivenRangerApp = null
+			}
+			
+			val userMetadata = userUntrusted.body[userMetaDataKey]
+			if (userMetadata != null) {
+				if ((userMetadata is HashMap<*, *>)) {
+					consentGivenRangerApp = userMetadata["consentGivenRangerApp"] as String?
+				}
+			}
+			
 			when {
 				guid.isNullOrEmpty() -> {
 					return Err(getString(R.string.an_error_occurred))
 				}
 				else -> {
-					return Ok(UserAuthResponse(guid, email, nickname, token, credentials.accessToken, credentials.refreshToken, roles, accessibleSites, defaultSite, picture))
+					return Ok(UserAuthResponse(guid, email, nickname, token, credentials.accessToken, credentials.refreshToken, roles, accessibleSites, defaultSite, picture, consentGivenRangerApp))
 				}
 			}
 		} catch (e: Exception) {
diff --git a/app/src/main/java/org/rfcx/ranger/util/Preferences.kt b/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
index dafcba503..2fde6f899 100644
--- a/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
@@ -43,6 +43,8 @@ class Preferences(context: Context) {
 		const val IMAGE_PROFILE = "${PREFIX}IMAGE_PROFILE"
 		const val EMAIL_SUBSCRIBE = "${PREFIX}EMAIL_SUBSCRIBE"
 		const val COORDINATES_FORMAT = "${PREFIX}COORDINATES_FORMAT"
+		const val CONSENT_GIVEN = "${PREFIX}CONSENT_GIVEN"
+		const val IS_RANGER = "${PREFIX}IS_RANGER"
 	}
 	
 	init {
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
index 19dd9bd8b..edf8a1a26 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
@@ -62,7 +62,7 @@ class InvitationCodeViewModel(private val context: Context, private val sendInvi
 			override fun onError(e: Throwable) {
 				callback(false)
 			}
-		}, InvitationCodeRequest(code))
+		}, InvitationCodeRequest(code, USER_ACCEPTED, APP_NAME))
 	}
 	
 	private fun refreshToken(callback: (Boolean) -> Unit) {
@@ -94,6 +94,11 @@ class InvitationCodeViewModel(private val context: Context, private val sendInvi
 			}
 		})
 	}
+	
+	companion object {
+		const val USER_ACCEPTED = "true"
+		const val APP_NAME = "RangerApp"
+	}
 }
 
 enum class SubmitState {
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
index ed1b6eb34..69e08a8dc 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
@@ -33,7 +33,15 @@ class LoginActivityNew : BaseActivity(), LoginListener {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_login_new)
 		val eventGuId = getEventFromIntentIfHave(intent)
-		if (CredentialKeeper(this).hasValidCredentials() && getSiteName().isNotEmpty() && getUserNickname().substring(0, 1) != "+") {
+		
+		val preferenceHelper = Preferences.getInstance(this)
+		val isConsentGiven = preferenceHelper.getBoolean(Preferences.CONSENT_GIVEN,false)
+		
+		if(CredentialKeeper(this).hasValidCredentials() && !isConsentGiven) {
+			supportFragmentManager.beginTransaction()
+					.add(loginContainer.id, TermsAndServiceFragment(),
+							"TermsAndServiceFragment").commit()
+		} else if (CredentialKeeper(this).hasValidCredentials() && getSiteName().isNotEmpty() && getUserNickname().substring(0, 1) != "+") {
 			MainActivityNew.startActivity(this@LoginActivityNew, eventGuId)
 			finish()
 		} else {
@@ -77,6 +85,13 @@ class LoginActivityNew : BaseActivity(), LoginListener {
 		
 	}
 	
+	override fun openTermsAndServiceFragment() {
+		supportFragmentManager.beginTransaction()
+				.replace(loginContainer.id, TermsAndServiceFragment(),
+						"TermsAndServiceFragment").commit()
+		
+	}
+	
 	private fun getEventFromIntentIfHave(intent: Intent?) :String? {
 		if (intent?.hasExtra("event_guid") == true) {
 			return intent.getStringExtra("event_guid")
@@ -89,4 +104,5 @@ interface LoginListener {
 	fun openMain()
 	fun openInvitationCodeFragment()
 	fun openSetUserNameFragmentFragment()
+	fun openTermsAndServiceFragment()
 }
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
index 824cfe5eb..fd8db0b7d 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
@@ -90,8 +90,8 @@ class LoginFragment : BaseFragment() {
 		loginViewModel.redirectPage.observe(this, Observer { loginRedirect ->
 			when (loginRedirect) {
 				LoginRedirect.MAIN_PAGE -> listener.openMain()
-				LoginRedirect.INVITE_CODE_PAGE -> listener.openInvitationCodeFragment()
 				LoginRedirect.SET_USER_NAME -> listener.openSetUserNameFragmentFragment()
+				LoginRedirect.TERMS_AND_SERVICE -> listener.openTermsAndServiceFragment()
 				else -> loading(false)
 			}
 		})
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
index d073adfe1..25fb593e1 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
@@ -159,18 +159,25 @@ class LoginViewModel(private val context: Context, private val checkUserTouchUse
 //	}
 	
 	fun checkUserDetail(userAuthResponse: UserAuthResponse) {
+		val preferenceHelper = Preferences.getInstance(context)
 		CredentialKeeper(context).save(userAuthResponse)
 		
 		checkUserTouchUseCase.execute(object : DisposableSingleObserver<Boolean>() {
 			override fun onSuccess(t: Boolean) {
+				val isConsentGiven = preferenceHelper.getBoolean(Preferences.CONSENT_GIVEN)
+				
 				if (userAuthResponse.isRanger) {
-					if (context.getUserNickname().substring(0, 1) == "+") {
+					preferenceHelper.putBoolean(Preferences.IS_RANGER, true)
+					if (!isConsentGiven) {
+						_redirectPage.postValue(LoginRedirect.TERMS_AND_SERVICE)
+					} else if (context.getUserNickname().substring(0, 1) == "+") {
 						_redirectPage.postValue(LoginRedirect.SET_USER_NAME)
 					} else {
 						_redirectPage.postValue(LoginRedirect.MAIN_PAGE)
 					}
 				} else {
-					_redirectPage.postValue(LoginRedirect.INVITE_CODE_PAGE)
+					preferenceHelper.putBoolean(Preferences.IS_RANGER, false)
+					_redirectPage.postValue(LoginRedirect.TERMS_AND_SERVICE)
 				}
 			}
 			
@@ -183,5 +190,5 @@ class LoginViewModel(private val context: Context, private val checkUserTouchUse
 }
 
 enum class LoginRedirect {
-	MAIN_PAGE, INVITE_CODE_PAGE, SET_USER_NAME
+	MAIN_PAGE, SET_USER_NAME, TERMS_AND_SERVICE
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt
new file mode 100644
index 000000000..d4d12c208
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt
@@ -0,0 +1,69 @@
+package org.rfcx.ranger.view.login
+
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import kotlinx.android.synthetic.main.fragment_terms_and_service.*
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.rfcx.ranger.R
+import org.rfcx.ranger.data.remote.success
+import org.rfcx.ranger.util.Preferences
+import org.rfcx.ranger.view.MainActivityNew
+import org.rfcx.ranger.view.base.BaseFragment
+
+class TermsAndServiceFragment : BaseFragment() {
+	lateinit var listener: LoginListener
+	private val termsAndServiceViewModel: TermsAndServiceViewModel by viewModel()
+	
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		listener = (context as LoginListener)
+	}
+	
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+	                          savedInstanceState: Bundle?): View? {
+		return inflater.inflate(R.layout.fragment_terms_and_service, container, false)
+	}
+	
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		
+		termsAndConditionsWebview.loadUrl("https://rfcx.org/terms-of-service-ranger-app-text-only")
+		
+		checkBox.setOnClickListener {
+			submitButton.isEnabled = checkBox.isChecked
+		}
+		
+		submitButton.setOnClickListener {
+			val preferenceHelper = context?.let { it1 -> Preferences.getInstance(it1) }
+			val isRanger = preferenceHelper?.getBoolean(Preferences.IS_RANGER, false)
+	
+			if (isRanger != null) {
+				if(isRanger){
+					termsAndServiceViewModel.acceptTerms()
+				} else {
+					listener.openInvitationCodeFragment()
+				}
+			}
+			
+			termsAndServiceViewModel.consentGivenState.observe(this, Observer {
+				it.success({ state ->
+					if (state) {
+						context?.let { it1 -> MainActivityNew.startActivity(it1, null) }
+					}
+				}, {
+					termsProgressBar.visibility = View.GONE
+					submitButton.visibility = View.VISIBLE
+					
+				}, {
+					termsProgressBar.visibility = View.VISIBLE
+					submitButton.visibility = View.INVISIBLE
+				})
+			})
+		}
+	}
+}
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt
new file mode 100644
index 000000000..271052b24
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt
@@ -0,0 +1,89 @@
+package org.rfcx.ranger.view.login
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.auth0.android.Auth0
+import com.auth0.android.authentication.AuthenticationAPIClient
+import com.auth0.android.authentication.AuthenticationException
+import com.auth0.android.callback.BaseCallback
+import com.auth0.android.result.Credentials
+import io.reactivex.observers.DisposableSingleObserver
+import org.rfcx.ranger.R
+import org.rfcx.ranger.data.remote.Result
+import org.rfcx.ranger.data.remote.terms.TermsUseCase
+import org.rfcx.ranger.entity.Err
+import org.rfcx.ranger.entity.Ok
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+import org.rfcx.ranger.util.CredentialKeeper
+import org.rfcx.ranger.util.CredentialVerifier
+import org.rfcx.ranger.util.Preferences
+import org.rfcx.ranger.util.getResultError
+
+class TermsAndServiceViewModel(private val context: Context, private val termsUseCase: TermsUseCase) : ViewModel() {
+	
+	private val auth0 by lazy {
+		val auth0 = Auth0(context.getString(R.string.auth0_client_id), context.getString(R.string.auth0_domain))
+		//auth0.isLoggingEnabled = true
+		auth0.isOIDCConformant = true
+		auth0
+	}
+	
+	private val authentication by lazy {
+		AuthenticationAPIClient(auth0)
+	}
+	
+	private val _consentGivenState = MutableLiveData<Result<Boolean>>()
+	val consentGivenState: LiveData<Result<Boolean>> get() = _consentGivenState
+	
+	fun acceptTerms() {
+		_consentGivenState.value = Result.Loading
+		
+		termsUseCase.execute(object : DisposableSingleObserver<TermsResponse>() {
+			override fun onSuccess(t: TermsResponse) {
+				if (t.success) {
+					refreshToken {
+						if (it) {
+							_consentGivenState.postValue(Result.Success(true))
+						}
+					}
+				}
+			}
+			
+			override fun onError(e: Throwable) {
+				_consentGivenState.value = e.getResultError()
+			}
+		}, TermsRequest("RangerApp"))
+	}
+	
+	private fun refreshToken(callback: (Boolean) -> Unit) {
+		val refreshToken = Preferences.getInstance(context).getString(Preferences.REFRESH_TOKEN)
+		if (refreshToken == null) {
+			callback(false)
+			return
+		}
+		
+		authentication.renewAuth(refreshToken).start(object : BaseCallback<Credentials, AuthenticationException> {
+			override fun onSuccess(credentials: Credentials) {
+				when (val result = CredentialVerifier(context).verify(credentials)) {
+					is Err -> {
+						callback(false)
+					}
+					is Ok -> {
+						val userAuthResponse = result.value
+						if (userAuthResponse.isRanger) {
+							CredentialKeeper(context).save(userAuthResponse)
+						}
+						callback(userAuthResponse.isRanger)
+					}
+				}
+			}
+			
+			override fun onFailure(error: AuthenticationException) {
+				callback(false)
+			}
+		})
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_terms_and_service.xml b/app/src/main/res/layout/fragment_terms_and_service.xml
new file mode 100644
index 000000000..cde272683
--- /dev/null
+++ b/app/src/main/res/layout/fragment_terms_and_service.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	tools:context=".view.login.TermsAndServiceFragment">
+	
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:clickable="true"
+		android:focusable="true"
+		android:focusableInTouchMode="true"
+		android:paddingBottom="@dimen/margin_padding_normal">
+		
+		<WebView
+			android:id="@+id/termsAndConditionsWebview"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_margin="@dimen/margin_padding_normal"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintBottom_toTopOf="@id/checkBox"/>
+		
+		<CheckBox
+			android:id="@+id/checkBox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_padding_normal"
+			app:layout_constraintStart_toStartOf="parent"
+			android:text="@string/terms_and_service"
+			app:layout_constraintBottom_toTopOf="@id/submitButton"/>
+		
+		<androidx.appcompat.widget.AppCompatButton
+			android:id="@+id/submitButton"
+			style="@style/RangerButton.GreenButton"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/button_height"
+			android:layout_marginStart="@dimen/margin_padding_normal"
+			android:layout_marginEnd="@dimen/margin_padding_normal"
+			android:layout_marginBottom="@dimen/margin_padding_normal"
+			android:text="@string/continue_text"
+			android:enabled="false"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent"/>
+		
+		<ProgressBar
+			android:id="@+id/termsProgressBar"
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/button_height"
+			android:layout_gravity="center"
+			android:background="@color/transparent"
+			android:layout_marginBottom="@dimen/margin_padding_normal"
+			android:visibility="gone"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent" />
+		
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fda6fc7b6..1ca9bb070 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -46,6 +46,9 @@
 	<string name="please_tell_name">Por favor, díganos su nombre</string>
 	<string name="hint_name">Nombre</string>
 	
+	<string name="terms_and_service">He leído y estoy de acuerdo con estos Términos y Servicio</string>
+	<string name="continue_text">Seguir</string>
+	
 	<!-- common error -->
 	<string name="error_common">Un error ha ocurrido. Por favor intente de nuevo.</string>
 	<string name="location_permission_msg">A Ranger App le gustaría usar tu ubicación</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 6c9fc4302..24a6335c7 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -46,6 +46,9 @@
     <string name="please_tell_name">Silakan beritahu kami nama Anda</string>
     <string name="hint_name">Nama</string>
     
+    <string name="terms_and_service">Saya telah membaca dan menyetujui Syarat dan Layanan</string>
+    <string name="continue_text">Terus</string>
+    
     <!-- common error -->
     <string name="error_common">terjadi kesalahan, silahkan coba lagi</string>
     <string name="location_permission_msg">Aplikasi Ranger ingin menggunakan lokasi Anda</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3268d6cf5..3ed715595 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -38,6 +38,9 @@
 	<string name="please_tell_name">Vertel ons uw naam</string>
 	<string name="hint_name">Naam</string>
 	
+	<string name="terms_and_service">Ik heb gelezen en ga akkoord met deze voorwaarden en service</string>
+	<string name="continue_text">Doorgaan met</string>
+	
 	<!-- common error -->
 	<string name="error_common">Er is een fout opgetreden. Probeer het opnieuw.</string>
 	<string name="location_permission_msg">Ranger App wilt uw locatie te gebruiken</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b949ca664..f120d25d2 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -46,6 +46,9 @@
     <string name="please_tell_name">Por favor, diga-nos o seu nome</string>
     <string name="hint_name">Nome</string>
     
+    <string name="terms_and_service">Eu li e concordo com os Termos e Serviço</string>
+    <string name="continue_text">Continuar</string>
+    
     <!-- common error -->
     <string name="error_common">Ocorreu um erro. Por favor, tente de novo.</string>
     <string name="location_permission_msg">O aplicativo Ranger gostaria de usar sua localização</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index b007cfe6f..ab8a24b10 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -45,6 +45,9 @@
     <string name="please_tell_name">กรุณาบอกชื่อคุณกับเรา</string>
     <string name="hint_name">ชื่อ</string>
     
+    <string name="terms_and_service">ข้าพเจ้าได้อ่านและยอมรับข้อกำหนดและบริการดังกล่าว</string>
+    <string name="continue_text">ถัดไป</string>
+    
     <!-- common error -->
     <string name="error_common">เกิดข้อผิดพลาด กรุณาลองใหม่อีกครั้ง</string>
     <string name="location_permission_msg">แอป Ranger ต้องการใช้ตำแหน่งของคุณ</string>
diff --git a/app/src/main/res/values/environment.xml b/app/src/main/res/values/environment.xml
index ed63e8255..a924bfd0c 100644
--- a/app/src/main/res/values/environment.xml
+++ b/app/src/main/res/values/environment.xml
@@ -8,6 +8,7 @@
     <string name="auth0_audience">https://rfcx.eu.auth0.com/userinfo</string>
     <string name="auth0_scopes">openid email profile offline_access</string>
     <string name="auth0_metadata_key">https://rfcx.org/app_metadata</string>
+    <string name="auth0_user_metadata_key">https://rfcx.org/user_metadata</string>
 
     <string name="google_maps_key">AIzaSyC-NLZPDq0jl8G5ZOvX48OeTylK8XR0M0s</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22db05551..be4db5f1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,9 @@
 	<string name="please_tell_name">Please tell us your name</string>
 	<string name="hint_name">Name</string>
 	
+	<string name="terms_and_service">I have read and agree to these Terms and Service</string>
+	<string name="continue_text">Continue</string>
+	
 	<!-- common error -->
 	<string name="error_common">An error occurred. Please try again.</string>
 	<string name="location_permission_msg">Ranger App would like to use your location</string>