diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index e2e17a9740..4fe1ef70d7 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -955,17 +955,14 @@ class App {
 
 			let options = {};
 
-			// Here we need a variable that can be set on the credentials
-			// so that base on that include the credentails on the body or
-			// leave it as default with woukd include the credentails on the header.
-			// if (thatvariableistrue) {
-			// 	options = {
-			// 		body: {
-			// 			client_id: _.get(oauthCredentials, 'clientId') as string,
-			// 			client_secret: _.get(oauthCredentials, 'clientSecret', '') as string,
-			// 		},
-			// 	}
-			// }
+			if (_.get(oauthCredentials, 'authentication', 'header') as string === 'body') {
+				options = {
+					body: {
+						client_id: _.get(oauthCredentials, 'clientId') as string,
+						client_secret: _.get(oauthCredentials, 'clientSecret', '') as string,
+					},
+				};
+			}
 
 			const oAuthObj = new clientOAuth2({
 				clientId: _.get(oauthCredentials, 'clientId') as string,
diff --git a/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
index 9466ce447b..afca85f57b 100644
--- a/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GithubOAuth2Api.credentials.ts
@@ -37,5 +37,11 @@ export class GithubOAuth2Api implements ICredentialType {
 			type: 'hidden' as NodePropertyTypes,
 			default: '',
 		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'header',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/OAuth2Api.credentials.ts b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
index efa5127e6e..ce2a248b62 100644
--- a/packages/nodes-base/credentials/OAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
@@ -53,5 +53,24 @@ export class OAuth2Api implements ICredentialType {
 			description: 'For some services additional query parameters have to be set which can be defined here.',
 			placeholder: 'access_type=offline',
 		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options' as NodePropertyTypes,
+			options: [
+				{
+					name: 'Body',
+					value: 'body',
+					description: 'Send credentials in body',
+				},
+				{
+					name: 'Header',
+					value: 'header',
+					description: 'Send credentials as Basic Auth header',
+				},
+			],
+			default: 'header',
+			description: 'Resource to consume.',
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
index 3617458a94..801b164ffd 100644
--- a/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/ZohoOAuth2Api.credentials.ts
@@ -68,7 +68,13 @@ export class ZohoOAuth2Api implements ICredentialType {
 			displayName: 'Auth URI Query Parameters',
 			name: 'authQueryParameters',
 			type: 'hidden' as NodePropertyTypes,
-			default: 'access_type=online',
+			default: 'access_type=offline',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'body',
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index ab6f00146c..04fe204858 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -9,12 +9,9 @@ import {
 } from 'n8n-workflow';
 
 export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('zohoOAuth2Api');
 	const options: OptionsWithUri = {
 		headers: {
 			'Content-Type': 'application/json',
-			//@ts-ignore
-			Authorization: `Zoho-oauthtoken ${credentials!.oauthTokenData.access_token}`
 		},
 		method,
 		body: {
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 2032a57921..f1d397c2dc 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -80,12 +80,16 @@ export class ZohoCrm implements INodeType {
 					// }
 					responseData = await zohoApiRequest.call(this, 'POST', '/leads', body);
 					responseData = responseData.data;
-
+				} else {
+					throw new Error(`The operation "${operation}" is not known!`);
 				}
+			} else {
+				throw new Error(`The resource "${resource}" is not known!`);
 			}
+
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
-			} else {
+			} else if (responseData !== undefined) {
 				returnData.push(responseData as IDataObject);
 			}
 		}